Move the sourcing of software.sh to genkernel

[genkernel.git] / defaults / linuxrc

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 90099c854d48a33254f5ef73b7061335b7e956f4..f434339d128d00f5826f20ec19d2504e79777dcd 100755 (executable)
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -293,7 +293,7 @@ mount_devfs
 # Mount sysfs
 mount_sysfs
 
-# Start mdev
+# Initialize mdev
 if [ "${KV_2_6_OR_GREATER}" ]
 then
        good_msg 'Activating mdev'
@@ -303,9 +303,6 @@ then
 
        # Setup hotplugging for firmware loading
        echo /sbin/mdev > /proc/sys/kernel/hotplug
-
-       # Setup mdev netlink socket daemon
-       ( cd /sys && mdev -s ) || bad_msg "Failed to receive dynamic updates from mdev"
 fi
 
 # Load modules listed in MY_HWOPTS if /lib/modules exists for the running kernel
@@ -329,6 +326,12 @@ else
        good_msg 'Skipping module load; no modules in the ramdisk!'
 fi
 
+# Ensure that device nodes are properly configured
+if [ "${KV_2_6_OR_GREATER}" ]
+then
+       mdev -s || bad_msg "mdev -s failed"
+fi
+
 # Apply scan delay if specified
 sdelay