cms/cmssetup.sh: sync udev rules names with network/net-genrules.sh

https://bugzilla.redhat.com/show_bug.cgi?id=825199

diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh
index 6a58ab5206b399a3c59518b75e239d69e4bd82f3..d2197ffefa9c188906f2cd6db49940d2ba177690 100755 (executable)
--- a/modules.d/40network/net-genrules.sh
+++ b/modules.d/40network/net-genrules.sh
@@ -56,7 +56,9 @@ fi
 
     # Default: We don't know the interface to use, handle all
     else
+        # if you change the name of "91-default-net.rules", also change modules.d/80cms/cmssetup.sh
         printf 'SUBSYSTEM=="net", RUN+="%s"\n' "/sbin/initqueue --onetime $ifup" > /etc/udev/rules.d/91-default-net.rules
     fi
 
+# if you change the name of "90-net.rules", also change modules.d/80cms/cmssetup.sh
 } > /etc/udev/rules.d/90-net.rules

diff --git a/modules.d/80cms/cmssetup.sh b/modules.d/80cms/cmssetup.sh
index 2208803a287c96c5cb5b69cf501469d2c7e1f6d2..e6daa079cb192c64b50faf870b28d6201920c560 100755 (executable)
--- a/modules.d/80cms/cmssetup.sh
+++ b/modules.d/80cms/cmssetup.sh
@@ -167,8 +167,8 @@ processcmsfile()
 
        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 ]] \
+        rm -f /etc/udev/rules.d/91-default-net.rules
+       [[ -f /etc/udev/rules.d/90-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
 
        znet_cio_free