SVN: geninitrd/trunk/geninitrd

[czarny]

Author: czarny
Date: Sat Jan 27 15:34:51 2007
New Revision: 8199

Modified:
   geninitrd/trunk/geninitrd
Log:
- using udevd instead of legacy udev
- killing daemon afterwards


Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Sat Jan 27 15:34:51 2007
@@ -1203,7 +1203,7 @@
 	mkdir -p $MNTIMAGE/etc/udev
 	mkdir -p $MNTIMAGE/sys
 
-	inst /sbin/initrd-udevd $MNTIMAGE/sbin/udev
+	inst /sbin/initrd-udevd $MNTIMAGE/sbin/udevd
 	inst /etc/udev/udev.conf $MNTIMAGE/etc/udev/udev.conf
 
 	if is_yes "$USE_UDEV"; then
@@ -1212,8 +1212,7 @@
 			mount -t proc none /proc
 			mount -t sysfs none /sys
 			: 'Starting udev'
-			/sbin/udev
-			echo -n /sbin/hotplug > /proc/sys/kernel/hotplug
+			/sbin/udevd --daemon
 			EOF
 		if is_yes "$PROBESTATICMODS"; then
 			inst /sbin/initrd-udevtrigger $MNTIMAGE/sbin/udevtrigger
@@ -1224,6 +1223,7 @@
 				EOF
 		fi
 		cat >> "$s" <<- 'EOF'
+			kill udevd
 			umount /proc
 			umount /sys
 			EOF
@@ -1237,7 +1237,7 @@
 	fi
 
 	# AFAIR it just needs tmpfs on /dev.
-	if [ ! -x $MNTIMAGE/sbin/udev ]; then
+	if [ ! -x $MNTIMAGE/sbin/udevd ]; then
 		echo "udev is needed on target initrd for dmraid to work!"
 		exit 1
 	fi