From: Harald Hoyer <harald@redhat.com>
Date: Thu, 10 Jun 2010 11:52:31 +0000 (+0200)
Subject: network: depend on ifcfg, if /etc/sysconfig/network-scripts exist
X-Git-Tag: 006~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4eab30506285cf178895ccb6554f9867061dc5d5;p=thirdparty%2Fdracut.git

network: depend on ifcfg, if /etc/sysconfig/network-scripts exist
---

diff --git a/modules.d/40network/check b/modules.d/40network/check
index e5cd87e7b..48b7f123e 100755
--- a/modules.d/40network/check
+++ b/modules.d/40network/check
@@ -1,5 +1,10 @@
 #!/bin/bash
 
+if [[ $1 = -d ]]; then
+  [ -d /etc/sysconfig/network-scripts/ ] && echo ifcfg
+  exit 0
+fi
+
 . $dracutfunctions
 
 for program in ip arping; do 
@@ -15,5 +20,8 @@ for program in dhclient brctl; do
     dwarning "Could not find program \"$program\" it might be required by network." 
   fi
 done
+
+
+
 exit 255
 
diff --git a/modules.d/45ifcfg/check b/modules.d/45ifcfg/check
index 6ebc8d49e..b8e40d91e 100755
--- a/modules.d/45ifcfg/check
+++ b/modules.d/45ifcfg/check
@@ -1,6 +1,6 @@
 #!/bin/sh
-[ -d /etc/sysconfig/network-scripts/ ] || exit 1
 
-[[ $1 = -d ]] && echo network
+# ifcfg is required by network
+#[[ $1 = -d ]] && echo network
 
 exit 255