SVN: geninitrd/trunk/geninitrd

[glen]

Author: glen
Date: Tue Oct 23 18:47:12 2007
New Revision: 8842

Modified:
   geninitrd/trunk/geninitrd
Log:
- bugfixes

Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Tue Oct 23 18:47:12 2007
@@ -268,16 +268,16 @@
 # 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 @@
 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