SVN: geninitrd/trunk/geninitrd

[baggins]

Author: baggins
Date: Thu Jan 21 14:45:16 2010
New Revision: 11116

Modified:
   geninitrd/trunk/geninitrd
Log:
- initrd-busybox changed to just busybox


Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Thu Jan 21 14:45:16 2010
@@ -1011,7 +1011,7 @@
 debug "Using _lib: $_lib"
 debug "Using initrd_dir: $initrd_dir"
 
-busybox=$(find_tool $initrd_dir/initrd-busybox /bin/initrd-busybox) || die "Couldn't find busybox suitable for initrd"
+busybox=$(find_tool $initrd_dir/busybox $initrd_dir/initrd-busybox /bin/initrd-busybox) || die "Couldn't find busybox suitable for initrd"
 
 # we setup mods after parsing command line args
 geninitrd_setup_mods
@@ -1145,10 +1145,10 @@
 mknod "$DESTDIR/dev/zero" c 1 5
 mknod "$DESTDIR/dev/urandom" c 1 9
 
-inst_exec $busybox /bin/initrd-busybox
-ln -s initrd-busybox $DESTDIR/bin/sh
-# for older busyboxes who had /bin/busybox as EXEPATH
-ln -s initrd-busybox $DESTDIR/bin/busybox
+inst_exec $busybox /bin/busybox
+ln -s busybox $DESTDIR/bin/sh
+# for older busyboxes who had /bin/initrd-busybox as EXEPATH
+ln -s busybox $DESTDIR/bin/initrd-busybox
 
 add_linuxrc <<EOF
 #!/bin/sh