aboutsummaryrefslogtreecommitdiff
path: root/rc.sysinit
diff options
context:
space:
mode:
authorKurt J. Bosch <kjb-temp-2009@alpenjodel.de>2011-06-24 16:50:33 +0200
committerKurt J. Bosch <kjb-temp-2009@alpenjodel.de>2011-06-24 16:50:33 +0200
commit5f1447418e83de7aec8b82eccf645446e28ea771 (patch)
tree32e87d1217a5a7ad9cab45a239af2fcde4106cae /rc.sysinit
parent18516c50897e1be65c83ccc3f60284b0bc67526f (diff)
downloadinitscripts-5f1447418e83de7aec8b82eccf645446e28ea771.tar.xz
rc.sysinit/rc.single: Merge UDev stuff into a function
rc.single changes (when coming from multi-user): * avoid settling UDev quietly as in rc.sysinit * modules defined in rc.conf are loaded if missing * minilogd is started before udevd as in rc.sysinit rc.sysinit behaviour is unchanged
Diffstat (limited to 'rc.sysinit')
-rwxr-xr-xrc.sysinit23
1 files changed, 2 insertions, 21 deletions
diff --git a/rc.sysinit b/rc.sysinit
index 52d9d4b..0d99aa3 100755
--- a/rc.sysinit
+++ b/rc.sysinit
@@ -71,27 +71,8 @@ if [[ $HWCLOCK_PARAMS ]]; then
fi
fi
-status "Starting UDev Daemon" udevd --daemon
-
-run_hook sysinit_udevlaunched
-
-stat_busy "Triggering UDev uevents"
- udevadm trigger --action=add --type=subsystems
- udevadm trigger --action=add --type=devices
-stat_done
-
-# Load modules from the MODULES array defined in rc.conf
-if [[ -f /proc/modules ]] && (( ${#MODULES[*]} )); then
- status "Loading Modules" modprobe -ab "${MODULES[@]}"
-fi
-
-status "Waiting for UDev uevents to be processed" \
- udevadm settle --timeout=${UDEV_TIMEOUT:-30}
-
-# in case loading a module changed the display mode
-calc_columns
-
-run_hook sysinit_udevsettled
+# Start/trigger UDev, load MODULES and settle UDev
+udevd_modprobe sysinit
# bring up the loopback interface
[[ -d /sys/class/net/lo ]] &&