From: Harald Hoyer <harald@redhat.com>
Date: Thu, 22 Nov 2012 11:31:18 +0000 (+0100)
Subject: cms/cmssetup.sh: sync udev rules names with network/net-genrules.sh
X-Git-Tag: 025~46
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0fb7b847c5f942f0f3c71f8b27b43ca883378241;p=thirdparty%2Fdracut.git

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 6a58ab520..d2197ffef 100755
--- 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 2208803a2..e6daa079c 100755
--- 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