From: Harald Hoyer <harald@redhat.com>
Date: Tue, 12 Jun 2012 12:40:43 +0000 (+0200)
Subject: resolve conflict between cms network rules and default rules
X-Git-Tag: 020~88
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8fab6e0463e0b0c70327c2733911098aa56137a7;p=thirdparty%2Fdracut.git

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 2d3dff265..99d0fe57e 100755
--- 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 41c853cb6..2208803a2 100755
--- 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