[readonly/geninitrd: 451/1068] - bugfixes

[draenog]

commit dab92b1d4b0ed8bd0bef0c845b3b69683a847027
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Tue Oct 23 16:47:12 2007 +0000

    - bugfixes
    
    svn-id: @8842

 geninitrd | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/geninitrd b/geninitrd
index 53ba6e6..2eac254 100755
--- a/geninitrd
+++ b/geninitrd
@@ -268,16 +268,16 @@ findmodule() {
 # it will operate recursively (copying directories)
 # and will symlink destinations if source is symlink.
 inst() {
-	if [ "$#" != "2" ];then
+	if [ "$#" -lt "2" ];then
 		die 'Usage: inst <file> $MNTIMAGE<destination>'
 	fi
-	debug "$1 -> $MNTIMAGE$2"
+	debug "$1${3:+ ...} -> $MNTIMAGE$2"
 	cp -HR "$1" "$MNTIMAGE$2"
 }
 
-inst_dir() {
+inst_d() {
 	if [ "$#" = "0" ];then
-		die 'Usage: inst_dir $MNTIMAGE<destination> $MNTIMAGE<destination>'
+		die 'Usage: inst_d $MNTIMAGE<destination> $MNTIMAGE<destination>'
 	fi
 	for dir in "$@"; do
 		debug "mkdir $MNTIMAGE$dir"
@@ -1059,8 +1059,8 @@ s="$RCFILE"
 ln -s /linuxrc $MNTIMAGE/init
 
 inst /bin/initrd-busybox /bin/initrd-busybox
-ln -s initrd-busybox /bin/sh
-ln -s initrd-busybox /bin/busybox # for older busyboxes who had /bin/busybox as EXEPATH
+ln -s initrd-busybox $MNTIMAGE/bin/sh
+ln -s initrd-busybox $MNTIMAGE/bin/busybox # for older busyboxes who had /bin/busybox as EXEPATH
 
 if is_yes "$USEINSMODSTATIC"; then
 	inst "$INSMOD" /bin/insmod.static
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/readonly/geninitrd.git/commitdiff/147754ca159d40ca5eb541074dc043d8cbd92090