SVN: geninitrd/trunk/geninitrd

[patrys]

Author: patrys
Date: Sun Feb 22 23:22:36 2009
New Revision: 10145

Modified:
   geninitrd/trunk/geninitrd
Log:
- use regular udev, not its broken cousin (fixed 180 sec hang during boot)


Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Sun Feb 22 23:22:36 2009
@@ -948,11 +948,11 @@
 	debug "Setting up udev..."
 	inst_d /sbin /etc/udev
 
-	if [ ! -x /sbin/initrd-udevd ]; then
-		die "/sbin/initrd-udevd not present"
+	if [ ! -x /sbin/udevd ]; then
+		die "/sbin/udevd not present"
 	fi
 
-	inst_exec /sbin/initrd-udevd /sbin/udevd
+	inst_exec /sbin/udevd /sbin/udevd
 	inst /etc/udev/udev.conf /etc/udev/udev.conf
 
 	mount_dev
@@ -962,7 +962,7 @@
 		/sbin/udevd --daemon
 	EOF
 
-	inst_exec /sbin/initrd-udevadm /sbin/udevadm
+	inst_exec /sbin/udevadm /sbin/udevadm
 	add_linuxrc <<-'EOF'
 		/sbin/udevadm trigger
 		/sbin/udevadm settle
@@ -1452,7 +1452,7 @@
 	die "You need to be root to generate initrd"
 fi
 
-if [ -f /etc/udev/udev.conf -a -x /sbin/initrd-udevd ]; then
+if [ -f /etc/udev/udev.conf -a -x /sbin/udevd ]; then
 	USE_UDEV=yes
 	. /etc/udev/udev.conf
 fi