summaryrefslogtreecommitdiff
path: root/rc.single
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.single
parent18516c50897e1be65c83ccc3f60284b0bc67526f (diff)
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.single')
-rwxr-xr-xrc.single19
1 files changed, 3 insertions, 16 deletions
diff --git a/rc.single b/rc.single
index 74368fd..46b502c 100755
--- a/rc.single
+++ b/rc.single
@@ -13,24 +13,11 @@ run_hook single_start
if [[ $PREVLEVEL != N ]]; then
kill_everything single
- status "Starting UDev Daemon" udevd --daemon
-
- run_hook single_udevlaunched
-
- # Trigger udev uevents
- stat_busy "Triggering UDev uevents"
- udevadm trigger --action=add --type=subsystems
- udevadm trigger --action=add --type=devices
- stat_done
-
- # Wait for udev uevents
- status "Waiting for UDev uevents to be processed" \
- udevadm settle --quiet --timeout=${UDEV_TIMEOUT:-30}
-
- run_hook single_udevsettled
-
# start up our mini logger until syslog takes over
minilogd
+
+ # Start/trigger UDev, load MODULES and settle UDev
+ udevd_modprobe single
fi
run_hook single_end