Fixed some minor bugs in mkinitramfs.

diff --git a/src/mkinitramfs/functions b/src/mkinitramfs/functions
index e09e6b804e7789a2513694e031d3a05b50fe40ef..89afdb56385a0f24165ac9d1492fced783bf029c 100644 (file)
--- 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 510f7488b8a3cbd3148fa1530345bdf377b959a9..ca4597e53b8450536def6f5df72d8554563fcbd1 100644 (file)
--- 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