diff options
| author | Matthias Hentges <oe@hentges.net> | 2006-02-22 10:55:47 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-02-22 10:55:47 +0000 |
| commit | 7fa138a2e324eba3776c73e81a23ca0e471ce212 (patch) | |
| tree | e85f4ccdd24c23d6f1710e57311bf805a9a6b47b /packages/altboot/files | |
| parent | 63af0eae1e76a81062cc6b2515f7de7b16eacd8f (diff) | |
altboot: update to 0.0.5-rc4, this version passes all kernel 2.6 tests
Diffstat (limited to 'packages/altboot/files')
| -rw-r--r-- | packages/altboot/files/altboot-menu/Advanced/30-bootUSB-Stick | 1 | ||||
| -rw-r--r-- | packages/altboot/files/altboot.func | 10 |
2 files changed, 5 insertions, 6 deletions
diff --git a/packages/altboot/files/altboot-menu/Advanced/30-bootUSB-Stick b/packages/altboot/files/altboot-menu/Advanced/30-bootUSB-Stick index c5222800e5..3cf8c506b0 100644 --- a/packages/altboot/files/altboot-menu/Advanced/30-bootUSB-Stick +++ b/packages/altboot/files/altboot-menu/Advanced/30-bootUSB-Stick @@ -8,6 +8,7 @@ M_TITLE="Boot USB Storage" test "$USB_HOST_AVAILABLE" = "yes" || exit 0 + die() { echo "ERROR: $1" >/dev/tty0 exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1 diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func index 1362268b83..9b570111e8 100644 --- a/packages/altboot/files/altboot.func +++ b/packages/altboot/files/altboot.func @@ -119,19 +119,17 @@ pivot_image() { echo "Setting up loopback (/dev/loop0) for $IMAGE_NAME" 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" - # Busybox's "mount" doesn't seem to like "-o loop" for some reason # It works on collie and b0rks on poodle. if [ "$IMAGE_TYPE" = "" ]; then IMAGE_TYPE="auto" 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 -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!" + # We direct the output to /dev/null so the user can see which step actually failed. + mount /dev/loop0 -t $IMAGE_TYPE /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" @@ -310,7 +308,7 @@ init_rootfs(){ fi echo -n "Generating device files..." >/dev/tty0 - /etc/init.d/devices start && echo ok >/dev/tty0|| die "FAILED" + /etc/init.d/devices start && echo ok >/dev/tty0 || die "FAILED" } mount_sd(){ |