--- trunk/busybox-initscripts/rc/rc	2010/12/15 18:13:51	1171
+++ trunk/initscripts/busybox/rc/rc	2012/01/20 22:59:46	1664
@@ -7,41 +7,31 @@
 # 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)"
 
-trap "" INT QUIT TSTP
+# source kernel config if exists
+[ -f /etc/conf.d/kernel ] && source /etc/conf.d/kernel
 
-[[ ! -z $1 ]] && runlevel=$1
+# override devicemanager helper functions
+if [[ ${RC_DEVICEMANAGER} = udev ]] && [[ -f ${rc_base}/init.d/udev ]]
+then
+	source ${rc_base}/init.d/udev
 
-if [[ -z ${runlevel} ]]
+elif [[ ${RC_DEVICEMANAGER} = mdev ]] && [[ -f ${rc_base}/init.d/mdev ]]
 then
-	echo "Usage: $0 <runlevel>" >&2
-	exit 1
+	source ${rc_base}/init.d/mdev
 fi
 
+trap "" INT QUIT TSTP
+
+[ "$1" != "" ] && runlevel=$1
 
 if [[ $runlevel = sysinit ]]
 then
 	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 "Copyright 2001-2012 Niels Rogalla; http://magellan-linux.net"
 	rc_echo
 
 	# mount proc filesystem, needed for bootsplash;
@@ -73,7 +63,7 @@
 	fi
 
 	# start device management
-	start_devmanager
+	start_devicemanager
 
 	## load devpts ##
 	# devfs/udev with 2.6 has no ptys, so devpts is also needed