From 5f1447418e83de7aec8b82eccf645446e28ea771 Mon Sep 17 00:00:00 2001
From: "Kurt J. Bosch" <kjb-temp-2009@alpenjodel.de>
Date: Fri, 24 Jun 2011 16:50:33 +0200
Subject: 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
---
 rc.sysinit | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

(limited to 'rc.sysinit')

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 ]] &&
-- 
cgit v1.2.3