]> git.ipfire.org Git - thirdparty/dracut.git/commitdiff
40network: install dhclient, brctl and ifenslave optionally
authorAmadeusz Żołnowski <aidecoe@aidecoe.name>
Fri, 25 Mar 2011 14:56:49 +0000 (15:56 +0100)
committerHarald Hoyer <harald@redhat.com>
Fri, 25 Mar 2011 15:28:28 +0000 (16:28 +0100)
Warning given by check() function in case if any of those binaries
doesn't exist was removed, because it's produces by "dracut_install -o"
later.

modules.d/40network/module-setup.sh

index 66cda68c88993f8f79c28caf356374ab3b17c978..f32745c17cdd5ac6e6e82e6e8fc917d1faf39c02 100755 (executable)
@@ -11,12 +11,6 @@ check() {
             return 1
         fi
     done
-    for program in dhclient brctl ifenslave tr; do
-        if ! type -P $program >/dev/null; then
-            dwarn "Could not find program \"$program\" it might be required " \
-                "by network."
-        fi
-    done
 
     return 255
 }
@@ -48,8 +42,8 @@ installkernel() {
 }
 
 install() {
-    dracut_install ip dhclient arping ifenslave tr
-    dracut_install -o brctl
+    dracut_install ip arping tr
+    dracut_install -o dhclient brctl ifenslave
     inst "$moddir/ifup" "/sbin/ifup"
     inst "$moddir/netroot" "/sbin/netroot"
     inst "$moddir/dhclient-script" "/sbin/dhclient-script"