--- trunk/busybox-initscripts/rc/rc	2008/06/02 22:14:35	724
+++ trunk/busybox-initscripts/rc/rc	2010/12/15 18:13:51	1171
@@ -1,18 +1,31 @@
 #!/bin/sh
-# $Header: /home/cvsd/magellan-cvs/magellan-src/busybox-initscripts/rc/rc,v 1.1 2008-06-02 22:14:35 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/busybox-initscripts/rc/rc,v 1.2 2008-12-22 22:09:27 niro Exp $
 
 source /etc/conf.d/rc
 source ${rc_functions}
 
-# load udev helper functions
-source ${rc_base}/init.d/udev
+# source kernel config if exists
+[ -f /etc/conf.d/kernel ] && source /etc/conf.d/kernel
+
+# prefer mdev if it is present, always fall back to udev
+# these settings can be overriden via /etc/conf.d/kernel
+if [[ -z ${RC_DEVMANAGER} ]]
+then
+	if [[ -e ${rc_base}/init.d/mdev ]]
+	then
+		RC_DEVMANAGER="udev"
+	elif [[ -e ${rc_base}/init.d/udev ]]
+	then
+		RC_DEVMANAGER="udev"
+	fi
+fi
+
+# load device management hooks
+source ${rc_base}/init.d/${RC_DEVMANAGER}
 
 # get mage version
 MAGEVER="$(< /etc/mageversion)"
 
-# source kernel config if exists
-[ -f /etc/conf.d/kernel ] && source /etc/conf.d/kernel
-
 trap "" INT QUIT TSTP
 
 [[ ! -z $1 ]] && runlevel=$1
@@ -26,20 +39,23 @@
 
 if [[ $runlevel = sysinit ]]
 then
-	echo
-	echo -e "${COLGREEN}Starting ${COLBLUE}MAGELLAN (v${MAGEVER}) ${COLGREEN}Linux${COLDEFAULT}"
-	echo -e "Copyright 2001-2008 Niels Rogalla; http://magellan-linux.net"
-	echo
+	rc_echo
+	rc_echo -e "${COLGREEN}Starting ${COLBLUE}MAGELLAN (v${MAGEVER}) ${COLGREEN}Linux${COLDEFAULT}"
+	rc_echo -e "Copyright 2001-2010 Niels Rogalla; http://magellan-linux.net"
+	rc_echo
 
 	# mount proc filesystem, needed for bootsplash;
 	# no use of '/etc/rc.d/init.d/mountproc' anymore
 	if [ ! -e /proc/mounts ]
 	then
-		echo -e ${COLOREDSTAR}"Mounting proc file system ..."
+		rc_print "Mounting proc file system ..."
 		mount -n /proc
 		evaluate_retval
 	fi
 
+	# load bootsplash
+	splash "rc_init" "${runlevel}"
+
 	# set default verbose level for kernel messages
 	[ -z "${RC_VERBOSE_LEVEL}" ] && RC_VERBOSE_LEVEL=3
 	echo "${RC_VERBOSE_LEVEL}" > /proc/sys/kernel/printk
@@ -47,18 +63,17 @@
 	# mount sys file system before udev
 	if [ -d /sys ]
 	then
-		echo -e ${COLOREDSTAR}"Mounting sysfs file system ..."
+		rc_print "Mounting sysfs file system ..."
 		mount -n -t sysfs sysfs /sys
 		evaluate_retval
 	else
-		echo -e ${COLORED}"Fatal: mountpoint /sys missing ..."
-		echo -e ${COLYELLOW}"Please create the directory /sys (mkdir -p /sys)."
-		echo -e ${COLYELLOW}"It's essential for a 2.6 kernel."
+		rc_echo -e ${COLORED}"Fatal: mountpoint /sys missing ..."
+		rc_echo -e ${COLYELLOW}"Please create the directory /sys (mkdir -p /sys)."
+		rc_echo -e ${COLYELLOW}"It's essential for a 2.6 kernel."
 	fi
 
-	#### load udev ####
-	start_udev
-	## end udev ##
+	# start device management
+	start_devmanager
 
 	## load devpts ##
 	# devfs/udev with 2.6 has no ptys, so devpts is also needed
@@ -72,25 +87,25 @@
 		if [ ! -d "/dev/pts" -a -e "/dev/.devfsd" ] && is_fs_mounted devfs
 		then
 			mkdir -p /dev/pts &> /dev/null || \
-				echo "Could not create /dev/pts !"
+				rc_echo "Could not create /dev/pts !"
 		fi
 
 		# now mount devpts
 		if [ -d /dev/pts ]
 		then
-			echo -e ${COLOREDSTAR}"Mounting devpts at /dev/pts ..."
+			rc_print "Mounting devpts at /dev/pts ..."
 			mount -n -t devpts -o gid=4,mode=0620 devpts /dev/pts
 			evaluate_retval
 		fi
 	else
 		# devpts is not supported, give a warning
-		echo -e ${COLRED}"No devpts filesystem found ..."
-		echo -e ${COLYELLOW}"Your Kernel doesn't support the devpts filesystem."
-		echo -e ${COLYELLOW}"Devfs with a kernel-2.6.x needs devpts,"
-		echo -e ${COLYELLOW}"or no pty's are available."
-		echo -e ${COLYELLOW}"Please make shure that this is enabled in your kernel."
-		echo
-		echo -e ${COLYELLOW}"Press any key to continue ..."
+		rc_echo -e ${COLRED}"No devpts filesystem found ..."
+		rc_echo -e ${COLYELLOW}"Your Kernel doesn't support the devpts filesystem."
+		rc_echo -e ${COLYELLOW}"Devfs/Udev with a kernel-2.6.x needs devpts,"
+		rc_echo -e ${COLYELLOW}"or no pty's are available."
+		rc_echo -e ${COLYELLOW}"Please make sure that this is enabled in your kernel."
+		rc_echo
+		rc_echo -e ${COLYELLOW}"Press any key to continue ..."
 		read
 	fi
 	## end devpts ##
@@ -99,19 +114,16 @@
 	## load usbfs ##
 	if kernel_supports_fs usbfs
 	then
-		echo -e ${COLOREDSTAR}"Mounting usbfs at /proc/bus/usb ..."
+		rc_print "Mounting usbfs at /proc/bus/usb ..."
 		mount -n -t usbfs usbfs /proc/bus/usb
 		evaluate_retval
 	fi
 	## end usbfs ##
 
 	## services state dir ##
-	echo -e ${COLOREDSTAR}"Mounting tmpfs at ${svcdir} ..."
+	rc_print "Mounting tmpfs at ${svcdir} ..."
 	mount -n -t tmpfs tmpfs "${svcdir}" -o rw,mode=0644,size="${svcsize}"k
 	evaluate_retval
-
-	# load bootsplash
-	splash "rc_init" "${runlevel}"
 fi
 
 if [[ ${runlevel} = shutdown ]] || [[ ${runlevel} = reboot ]]
@@ -125,12 +137,15 @@
 	if [[ ${RC_DEVICE_TARBALL} = yes ]] && \
 		[ -e /dev/.udev -a ! -e /dev/.devfsd -a ! -e /.bootdev ]
 	then
-		echo -e ${COLOREDSTAR}"Saving /dev device nodes ..."
+		rc_print "Saving /dev device nodes ..."
 		( cd /dev; tar -jclpf "/tmp/devices-$$.tar.bz2" * &> /dev/null )
 		mv -f "/tmp/devices-$$.tar.bz2" /lib/udev/state/devices.tar.bz2
 		evaluate_retval
 	fi
 
+	# stop device management
+	stop_devicemanager
+
 	# run through all runlevel scripts
 	for i in $(ls -v ${rc_base}/rc${runlevel}.d/K* 2> /dev/null)
 	do
@@ -163,3 +178,9 @@
 		fi
 	done
 fi
+
+if [[ ${runlevel} = boot ]]
+then
+	# exit bootsplash
+	splash "rc_exit" "${runlevel}"
+fi