diff mbox series

[v6] mpls01: Add --allow-unsupported for modprobe(fixing all mpls cases)

Message ID 20240904065653.31086-1-wegao@suse.com
State Accepted
Headers show
Series [v6] mpls01: Add --allow-unsupported for modprobe(fixing all mpls cases) | expand

Commit Message

Wei Gao Sept. 4, 2024, 6:56 a.m. UTC 
In sle-micro we encounter following error when do modprobe:
root# modprobe mpls_router
modprobe: ERROR: module 'mpls_router' is unsupported
modprobe: ERROR: Use --allow-unsupported or set allow_unsupported_modules 1 in
modprobe: ERROR: /etc/modprobe.d/10-unsupported-modules.conf
modprobe: ERROR: could not insert 'mpls_router': Operation not permitted

Signed-off-by: Wei Gao <wegao@suse.com>
Reviewed-by: Petr Vorel <pvorel@suse.cz>
---
 testcases/network/mpls/mpls01.sh   |  4 ++--
 testcases/network/mpls/mpls_lib.sh | 12 +++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

Comments

Petr Vorel Sept. 5, 2024, 5:12 a.m. UTC | #1 
Hi Wei,

...
> +mpls_setup_driver()
> +{
> +	local args
> +
> +	grep -q 'sl-micro' /etc/os-release && args='--allow-unsupported'

I'm going to merge in few hours with following change

-       grep -q 'sl-micro' /etc/os-release && args='--allow-unsupported'
+       grep -q -w ID_LIKE.*suse /etc/os-release && args='--allow-unsupported'

(to implement Cyril's wish to apply the change also for SLES and openSUSE. I'm
sorry although I suggested that in v4, then in the full example I in the end
used 'sl-micro'.


Kind regards,
Petr

> +	if [ "$TST_NEEDS_DRIVERS" ]; then
> +		tst_net_run -s "modprobe $args -a $TST_NEEDS_DRIVERS"
> +	fi
> +}
> +
>  mpls_setup()
>  {
>  	local label="$1"
...
Cyril Hrubis Sept. 5, 2024, 8:47 a.m. UTC | #2 
Hi!
> > +mpls_setup_driver()
> > +{
> > +	local args
> > +
> > +	grep -q 'sl-micro' /etc/os-release && args='--allow-unsupported'
> 
> I'm going to merge in few hours with following change
> 
> -       grep -q 'sl-micro' /etc/os-release && args='--allow-unsupported'
> +       grep -q -w ID_LIKE.*suse /etc/os-release && args='--allow-unsupported'
> 
> (to implement Cyril's wish to apply the change also for SLES and openSUSE. I'm
> sorry although I suggested that in v4, then in the full example I in the end
> used 'sl-micro'.

Works for me. Acked-by: Cyril Hrubis <chrubis@suse.cz>
Petr Vorel Sept. 5, 2024, 12:02 p.m. UTC | #3 
Hi Cyril,

> Hi!
> > > +mpls_setup_driver()
> > > +{
> > > +	local args
> > > +
> > > +	grep -q 'sl-micro' /etc/os-release && args='--allow-unsupported'

> > I'm going to merge in few hours with following change

> > -       grep -q 'sl-micro' /etc/os-release && args='--allow-unsupported'
> > +       grep -q -w ID_LIKE.*suse /etc/os-release && args='--allow-unsupported'

> > (to implement Cyril's wish to apply the change also for SLES and openSUSE. I'm
> > sorry although I suggested that in v4, then in the full example I in the end
> > used 'sl-micro'.

> Works for me. Acked-by: Cyril Hrubis <chrubis@suse.cz>

Thanks for your ack, merged.

Kind regards,
Petr
diff mbox series

Patch

diff --git a/testcases/network/mpls/mpls01.sh b/testcases/network/mpls/mpls01.sh
index 196b5b2f9..e453f8130 100755
--- a/testcases/network/mpls/mpls01.sh
+++ b/testcases/network/mpls/mpls01.sh
@@ -21,7 +21,7 @@  cleanup()
 
 setup()
 {
-	ROD modprobe mpls_router
+	mpls_setup_driver
 }
 
 test1()
@@ -66,5 +66,5 @@  test3()
 	tst_res TPASS "created and removed mpls routes"
 }
 
-. tst_net.sh
+. mpls_lib.sh
 tst_run
diff --git a/testcases/network/mpls/mpls_lib.sh b/testcases/network/mpls/mpls_lib.sh
index 380b568bb..3c63e16a7 100755
--- a/testcases/network/mpls/mpls_lib.sh
+++ b/testcases/network/mpls/mpls_lib.sh
@@ -33,11 +33,21 @@  mpls_virt_cleanup()
 	mpls_cleanup
 }
 
+mpls_setup_driver()
+{
+	local args
+
+	grep -q 'sl-micro' /etc/os-release && args='--allow-unsupported'
+	if [ "$TST_NEEDS_DRIVERS" ]; then
+		tst_net_run -s "modprobe $args -a $TST_NEEDS_DRIVERS"
+	fi
+}
+
 mpls_setup()
 {
 	local label="$1"
 
-	tst_net_run -s "modprobe -a $TST_NEEDS_DRIVERS"
+	mpls_setup_driver
 
 	ROD sysctl -q net.mpls.conf.$(tst_iface).input=1
 	tst_set_sysctl net.mpls.conf.lo.input 1 safe