SVN: geninitrd/trunk/geninitrd

[arekm]

Author: arekm
Date: Wed Feb  7 11:12:02 2007
New Revision: 8233

Modified:
   geninitrd/trunk/geninitrd
Log:
Revert, conflicts seems more sane way.

Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Wed Feb  7 11:12:02 2007
@@ -57,7 +57,7 @@
 # is /dev on tmpfs. internal variable
 tmpfs_dev=
 
-if [ -f /etc/udev/udev.conf ] && [ -x /sbin/initrd-udevd -o -x /sbin/initrd-udev ]; then
+if [ -f /etc/udev/udev.conf -a -x /sbin/initrd-udevd ]; then
 	USE_UDEV="yes"
 	. /etc/udev/udev.conf
 fi
@@ -1236,12 +1236,7 @@
 	mkdir -p $MNTIMAGE/etc/udev
 	mkdir -p $MNTIMAGE/sys
 
-	if [ -x /sbin/initrd-udev ]; then
-		inst /sbin/initrd-udev $MNTIMAGE/sbin/udev
-		ln -sf udev $MNTIMAGE/sbin/udevd
-	else
-		inst /sbin/initrd-udevd $MNTIMAGE/sbin/udevd
-	fi
+	inst /sbin/initrd-udevd $MNTIMAGE/sbin/udevd
 	inst /etc/udev/udev.conf $MNTIMAGE/etc/udev/udev.conf
 
 	if is_yes "$USE_UDEV"; then