--- trunk/magellan-initscripts/etc/rc.d/init.d/rc	2005/07/03 21:34:35	150
+++ trunk/magellan-initscripts/etc/rc.d/init.d/rc	2006/10/31 09:10:45	394
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Header: /home/cvsd/magellan-cvs/magellan-src/magellan-initscripts/etc/rc.d/init.d/rc,v 1.5 2005-07-03 21:34:35 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/magellan-initscripts/etc/rc.d/init.d/rc,v 1.10 2006-10-31 09:10:45 niro Exp $
 
 source /etc/sysconfig/rc
 source $rc_functions
@@ -10,25 +10,69 @@
 # source kernel config if exists
 [ -f /etc/conf.d/kernel ] && source /etc/conf.d/kernel
 
-# some needed functions functions
-populate_udev() {
+udev_version()
+{
+	local version=0
+
+	if [[ -x /sbin/udev ]]
+	then
+		version=$(/sbin/udev -V)
+		# We need it without a leading '0', else bash do the wrong thing
+		version=${version##0}
+		# Older udev's will print nothing
+		[[ -z ${version} ]] && version=0
+	fi
+
+	echo "${version}"
+}
+
+populate_udev()
+{
+	local opts
+
+	# populate /dev with devices already found by the kernel
+	if [ "$(kernel_version | sed 's:\.::g' | cut -d_ -f1)" -gt "2614" ]
+	then
+		echo -e ${COLOREDSTAR}"  Populating /dev with existing devices through uevents ..."
+		[[ $(udev_version) -ge "96" ]] && opts="--attr-match=dev"
+		/sbin/udevtrigger ${opts}
+		evaluate_retval
+	else
+		echo -e ${COLOREDSTAR}"  Populating /dev with existing devices with udevstart ..."
 		/sbin/udevstart
+		evaluate_retval
+	fi
+
+	# loop until everything is finished
+	echo -e ${COLOREDSTAR}"  Letting udev process events ..."
+	/sbin/udevsettle --timeout=60
+	evaluate_retval
 
+	return 0
+}
+
+seed_dev()
+{
+	# seed /dev with some things that we know we need
+	echo -e ${COLOREDSTAR}"  Seeding /dev with needed nodes ..."
+	(
+		# copy over any persistant things
+		if [[ -d /lib/udev/devices ]]
+		then
+			cp --preserve=all --recursive --update /lib/udev/devices/* /dev
+		fi
+	
 		# not provided by sysfs but needed
 		ln -snf /proc/self/fd /dev/fd
 		ln -snf fd/0 /dev/stdin
 		ln -snf fd/1 /dev/stdout
 		ln -snf fd/2 /dev/stderr
-		ln -snf /proc/kcore /dev/core
-		ln -snf /proc/asound/oss/sndstat /dev/sndstat
-
+		[[ -e /proc/kcore ]] && ln -snf /proc/kcore /dev/core
+	
 		# create problematic directories
 		mkdir -p /dev/{pts,shm}
-
-		# same as /dev/.devfsd
-		touch /dev/.udev
-
-		return 0
+	)
+	evaluate_retval
 }
 
 trap "" INT QUIT TSTP
@@ -39,7 +83,7 @@
 then
 	echo
 	echo -e "${COLGREEN}Starting ${COLBLUE}MAGELLAN (v${MAGEVER}) ${COLGREEN}Linux${COLDEFAULT}"
-	echo -e "Copyright 2001-2005 Niels Rogalla; http://magellan-linux.net"
+	echo -e "Copyright 2001-2006 Niels Rogalla; http://magellan-linux.net"
 	echo
 
 	# mount proc filesystem, needed for bootsplash;
@@ -109,36 +153,57 @@
 	then
 		# create a ramdisk for populating udev
 		echo -e ${COLOREDSTAR}"Mounting udev at /dev ..."
-		# tmpfs was suggested by Greg Kroah-Hartman
 		# many video drivers needed exec access
-		mount -n -t ramfs udev /dev -o exec,nosuid,mode=0755
+		fstype=ramfs
+		# tmpfs was suggested by Greg Kroah-Hartman
+		[[ kernel_supports_fs tmpfs ]] && fstype=tmpfs
+		mount -n -t ${fstype} udev /dev -o exec,nosuid,mode=0755
 		evaluate_retval
 
 		# if a device tarball exists load it and if it is activated
 		echo -e ${COLOREDSTAR}"Configurating system to use udev ..."
 		if [[ ${RC_DEVICE_TARBALL} = yes ]]
 		then
-			echo -e ${COLOREDSTAR}"  Populating /dev with with device nodes ..."
+			echo -e ${COLOREDSTAR}"  Populating /dev with saved device nodes ..."
 			tar -jxpf /lib/udev-state/devices.tar.bz2 -C /dev
 			evaluate_retval
 		fi
 
-		# now load udev
-		populate_udev
+		# other eeded device nodes with udev
+		seed_dev
 
-		# if hotplug support exists in the kernel use it to manage udev
-		if [ -e /proc/sys/kernel/hotplug -a -x /sbin/hotplug ]
+		if [ -e /proc/sys/kernel/hotplug ]
 		then
-			echo -e ${COLOREDSTAR}"  Using /sbin/hotplug for udev management ..."
-
-		elif [ -e /proc/sys/kernel/hotplug ]
-		then
-			echo -e ${COLOREDSTAR}"  Setting /sbin/udev as hotplug agent ..."
-			echo "/sbin/udev" > /proc/sys/kernel/hotplug
+			if [ "$(kernel_version | sed 's:\.::g' | cut -d_ -f1)" -gt "2614" ]
+			then
+				echo -e ${COLOREDSTAR}"  Using netlink for hotplug events ..."
+				echo "" > /proc/sys/kernel/hotplug
+				evaluate_retval
+			else
+				echo -e ${COLOREDSTAR}"  Setting /sbin/udevsend as hotplug agent ..."
+				echo "/sbin/udevsend" > /proc/sys/kernel/hotplug
+				evaluate_retval
+			fi
 		else
 			echo -e ${COLOREDSTAR}${COLYELLOW}"  Kernel was not compiled with hotplug support !"
+			print_status failure
 		fi
+
+		echo -e ${COLOREDSTAR}"  Starting udevd daemon ..."
+		/sbin/udevd --daemon
 		evaluate_retval
+
+		populate_udev
+
+		# create nodes that udev can't
+		echo -e ${COLOREDSTAR}"  Finializing udev configuration ..."
+		[[ -x /sbin/dmsetup ]] && /sbin/dmsetup mknodes &>/dev/null
+		[[ -x /sbin/lvm ]] && /sbin/lvm vgscan -P --mknodes --ignorelockingfailure &>/dev/null
+		[[ -x /sbin/evms_activate ]] && /sbin/evms_activate -q &>/dev/null
+		print_status success
+
+		# same thing as /dev/.devfsd
+		touch /dev/.udev
 	fi
 
 	## load devpts ##