From 3e874cfd73e0cb70abd568c5b070ff85609af3a4 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Sun, 5 Jun 2011 02:29:40 +0200 Subject: udev: don't silence settle + trivial If settle finishes too early, we want to know as some needed devices might not yet have been enumerated. Do not pass --quiet. Do not check for running udev before doing trigger/settle. Worst case, if someone does not have udev (which is not supported), they will see some extra status lines, but boot will still continue. Lastly, remove obvious comments (they were repeating the status message in the line below). Signed-off-by: Tom Gundersen --- rc.sysinit | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'rc.sysinit') diff --git a/rc.sysinit b/rc.sysinit index 9126d05..b2b0943 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -80,13 +80,10 @@ status "Starting UDev Daemon" udevd --daemon run_hook sysinit_udevlaunched -# Trigger udev uevents -if pidof udevd &>/dev/null; then - stat_busy "Triggering UDev uevents" - udevadm trigger --action=add --type=subsystems - udevadm trigger --action=add --type=devices - stat_done -fi +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 mods=${MODULES[@]/!*/} @@ -95,11 +92,8 @@ if [[ $load_modules != off && -f /proc/modules && $mods ]]; then fi unset mods -# Wait for udev uevents -if pidof udevd &>/dev/null; then - status "Waiting for UDev uevents to be processed" \ - udevadm settle --quiet --timeout=${UDEV_TIMEOUT:-30} -fi +status "Waiting for UDev uevents to be processed" \ + udevadm settle --timeout=${UDEV_TIMEOUT:-30} run_hook sysinit_udevsettled -- cgit v1.2.3