resolve conflict between cms network rules and default rules

diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh
index 2d3dff2656eab702604e895e37ace629604d552c..99d0fe57e2d12c2e74e9094bc90aa617ddcebd0a 100755 (executable)
--- a/modules.d/40network/net-genrules.sh
+++ b/modules.d/40network/net-genrules.sh
@@ -53,7 +53,7 @@ fix_bootif() {
 
     # Default: We don't know the interface to use, handle all
     else
-        printf 'SUBSYSTEM=="net", RUN+="%s"\n' "/sbin/initqueue --onetime $ifup"
+        printf 'SUBSYSTEM=="net", RUN+="%s"\n' "/sbin/initqueue --onetime $ifup" > /etc/udev/rules.d/61-default-net.rules
     fi
 
 } > /etc/udev/rules.d/60-net.rules

diff --git a/modules.d/80cms/cmssetup.sh b/modules.d/80cms/cmssetup.sh
index 41c853cb65fc2625ca172c8a658b655db68ab6a4..2208803a287c96c5cb5b69cf501469d2c7e1f6d2 100755 (executable)
--- a/modules.d/80cms/cmssetup.sh
+++ b/modules.d/80cms/cmssetup.sh
@@ -166,6 +166,8 @@ processcmsfile()
         fi
 
        printf 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="%s", KERNELS=="%s", ENV{INTERFACE}=="?*", RUN+="/sbin/initqueue --onetime --unique --name cmsifup-$env{INTERFACE} /sbin/cmsifup $env{INTERFACE}"\n' "$driver" "$devbusid" > /etc/udev/rules.d/99-cms.rules
+        # remove the default net rules
+        rm -f /etc/udev/rules.d/61-default-net.rules
        [[ -f /etc/udev/rules.d/60-net.rules ]] \
            || printf 'SUBSYSTEM=="net", ACTION=="online", RUN+="/sbin/initqueue --onetime --env netif=$env{INTERFACE} source_hook initqueue/online"\n' >> /etc/udev/rules.d/99-cms.rules