altboot: Update to latest development version

diff --git a/packages/altboot/altboot.bb b/packages/altboot/altboot.bb
index b0639e9..ef87e88 100644 (file)
--- a/packages/altboot/altboot.bb
+++ b/packages/altboot/altboot.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Matthias 'CoreDump' Hentges  <oe@hentges.net>"
 LICENSE = "GPL"
 IGNORE_STRIP_ERRORS = "1"
 
-PR = "r18"
+PR = "r19"
 
 
 SRC_URI = "file://altboot-menu \

diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func
index 5651ef9..6dfad21 100644 (file)
--- a/packages/altboot/files/altboot.func
+++ b/packages/altboot/files/altboot.func
@@ -120,6 +120,7 @@ pivot_image() {
        losetup /dev/loop0 $1/$IMAGE_PATH/$IMAGE_NAME || die "losetup /dev/loop0 $1/$IMAGE_PATH/$IMAGE_NAME failed!"
        check_fs /dev/loop0 $IMAGE_TYPE
 
+       losetup -d /dev/loop0
        echo -e "\n* * * Booting rootfs image * * *\n"
 
 
@@ -130,7 +131,7 @@ pivot_image() {
        fi
        # If mount fails it has the tendency to spew out a _lot_ of error messages.
        # We direct the output to /dev/null so the user can see which step actually failed.
-       mount -t $IMAGE_TYPE /dev/loop0 /media/image >/dev/null 2>&1 || die "mount -t $IMAGE_TYPE /dev/loop0 /media/image failed!"
+       mount -o loop -t $IMAGE_TYPE $1/$IMAGE_PATH/$IMAGE_NAME /media/image >/dev/null 2>&1 || die "mount -t $IMAGE_TYPE /dev/loop0 /media/image failed!"
 
        mkdir -p /media/image/media/ROM || die "mkdir -p /media/image/media/ROM failed"
 

diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot
index 2ef804d..eb321ad 100644 (file)
--- a/packages/altboot/files/init.altboot
+++ b/packages/altboot/files/init.altboot
@@ -297,10 +297,16 @@ else
        set_password >/dev/tty0 
        
        test "$ASK_PW_ON_BOOT" = "yes" && verify_master_pw >/dev/tty0 
+
+
+       # When started with -force, always print the menu
+       echo "$*" | grep -q "-force" && TIMEOUT=0
+
        
        # This timeout works by reading /proc/interrupts to see if the keyboard interrupt
        # increases while the timer is running. A TIMEOUT of 0 will always launch altboot.      
        run_timer >/dev/tty1 2>&1
+
                
        echo "" >/dev/tty0