diff options
| author | Matthias Hentges <oe@hentges.net> | 2006-02-08 16:58:12 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-02-08 16:58:12 +0000 |
| commit | 85a490438495e9fae98ef134defd11f443c177f9 (patch) | |
| tree | eb370542df4638af308d8821fc91146940a88a8a /packages/altboot | |
| parent | 58582554b59fbfca2c98a48c3b197f2b0e322bfc (diff) | |
altboot: Update to latest development version
Diffstat (limited to 'packages/altboot')
| -rw-r--r-- | packages/altboot/altboot.bb | 2 | ||||
| -rw-r--r-- | packages/altboot/files/altboot.func | 3 | ||||
| -rw-r--r-- | packages/altboot/files/init.altboot | 6 |
3 files changed, 9 insertions, 2 deletions
diff --git a/packages/altboot/altboot.bb b/packages/altboot/altboot.bb index b0639e9251..ef87e880c9 100644 --- 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 5651ef9f9d..6dfad21374 100644 --- 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 2ef804d99c..eb321ad456 100644 --- 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 |