From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 6 May 2009 20:47:06 +0000 (+0200)
Subject: Fixed some minor bugs in mkinitramfs.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8b7be547625d83ef3e14c2c90afeb721748ef0d;p=ipfire-3.x.git

Fixed some minor bugs in mkinitramfs.
---

diff --git a/src/mkinitramfs/functions b/src/mkinitramfs/functions
index e09e6b804..89afdb563 100644
--- a/src/mkinitramfs/functions
+++ b/src/mkinitramfs/functions
@@ -584,7 +584,7 @@ $HEADER
 export PATH=/sbin:/bin:/usr/sbin:/usr/bin
 export TERM=linux
 
-INIT="/sbin/init"
+init="/sbin/init"
 VERBOSE=-v
 
 READONLY=0
@@ -646,7 +646,7 @@ echo "" > /proc/sys/kernel/hotplug
 for o in $(cat /proc/cmdline) ; do
 	case $o in
 	init=*)
-		INIT=${o#init=}
+		init=${o#init=}
 		;;
 	ro)
 		READONLY=1
diff --git a/src/mkinitramfs/mkliveramfs b/src/mkinitramfs/mkliveramfs
index 510f7488b..ca4597e53 100644
--- a/src/mkinitramfs/mkliveramfs
+++ b/src/mkinitramfs/mkliveramfs
@@ -277,7 +277,7 @@ if [ -n "$OVERLAY" ]; then
 	aufsmountoptions="$aufsmountoptions:/mnt/overlayfs=rr"
 fi
 
-SQUASHED=$(ls /mnt/source/*.img 2>/dev/null || true)
+SQUASHED=$(ls /mnt/source/*.sfs 2>/dev/null || true)
 if [ -n "$SQUASHED" ] ; then
 	vecho "Setting up embedded squashfs..."
 	mount -t squashfs -o loop,ro $SQUASHED /mnt/squashfs