--- trunk/magellan-initscripts/etc/rc.d/init.d/rc	2008/12/22 22:08:32	782
+++ trunk/magellan-initscripts/etc/rc.d/init.d/rc	2010/07/14 14:37:57	1105
@@ -1,18 +1,25 @@
 #!/bin/bash
-# $Header: /home/cvsd/magellan-cvs/magellan-src/magellan-initscripts/etc/rc.d/init.d/rc,v 1.22 2008-12-22 22:08:32 niro Exp $
+# $Id$
 
 source /etc/conf.d/rc
 source ${rc_functions}
 
-# load udev helper functions
-source ${rc_base}/init.d/udev
-
 # get mage version
 MAGEVER="$(< /etc/mageversion)"
 
 # source kernel config if exists
 [ -f /etc/conf.d/kernel ] && source /etc/conf.d/kernel
 
+# override devicemanager helper functions
+if [[ ${RC_DEVICEMANAGER} = udev ]] && [[ -f ${rc_base}/init.d/udev ]]
+then
+	source ${rc_base}/init.d/udev
+
+elif [[ ${RC_DEVICEMANAGER} = mdev ]] && [[ -f ${rc_base}/init.d/mdev ]]
+then
+	source ${rc_base}/init.d/mdev
+fi
+
 trap "" INT QUIT TSTP
 
 [ "$1" != "" ] && runlevel=$1
@@ -21,7 +28,7 @@
 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 -e "Copyright 2001-2010 Niels Rogalla; http://magellan-linux.net"
 	echo
 
 	# mount proc filesystem, needed for bootsplash;
@@ -50,9 +57,9 @@
 	fi
 
 
-	#### load udev ####
-	start_udev
-	## end udev ##
+	#### load udev|mdev| ####
+	start_devicemanager
+	## end udev|mdev ##
 
 
 	## load devpts ##
@@ -81,9 +88,9 @@
 		# 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}"Devfs/Udev 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 -e ${COLYELLOW}"Please make sure that this is enabled in your kernel."
 		echo
 		echo -e ${COLYELLOW}"Press any key to continue ..."
 		read
@@ -126,6 +133,9 @@
 		mv -f "/tmp/devices-$$.tar.bz2" /lib/udev/state/devices.tar.bz2
 		evaluate_retval
 	fi
+
+	# stop udev|mdev now
+	stop_devicemanager
 fi