diff options
| author | Matthias Hentges <oe@hentges.net> | 2006-03-30 17:17:32 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-03-30 17:17:32 +0000 |
| commit | e3e84da7c3b912a0abbfdda9655fb8402368abc8 (patch) | |
| tree | 52c1ff55d44439eafbcd6869b01e1fe1c62eac67 | |
| parent | 3b7dddd7bc2d21c17b99a3fae6ae83a495a704f4 (diff) | |
altboot: Be more verbose about when all messages are coming from the new rootfs
| -rw-r--r-- | packages/altboot/altboot_0.0.0.bb | 4 | ||||
| -rw-r--r-- | packages/altboot/files/altboot.func | 30 |
2 files changed, 24 insertions, 10 deletions
diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb index 020546dd64..685633cdd8 100644 --- a/packages/altboot/altboot_0.0.0.bb +++ b/packages/altboot/altboot_0.0.0.bb @@ -1,12 +1,12 @@ DESCRIPTION = "A text-based bootmanager allowing a Zaurus to boot from SD, CF, USB-Storage and NFS. \ -Tested machines: Collie, Poodle, Akita, Spitz" +Tested machines: Collie, Poodle, Akita, Spitz, C7x0, Tosa" SECTION = "base" PRIORITY = "optional" MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" LICENSE = "GPL" IGNORE_STRIP_ERRORS = "1" -PR = "r28" +PR = "r29" SRC_URI = "file://altboot-menu \ diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func index 4389ff4ff8..612a0243b2 100644 --- a/packages/altboot/files/altboot.func +++ b/packages/altboot/files/altboot.func @@ -37,9 +37,9 @@ check_target() { then read junk < /dev/tty1 else - if test -e /etc/.altboot-$2-real-or-loop.last + if test -e /etc/.altboot-real-or-loop.last then - junk="`cat /etc/.altboot-$2-real-or-loop.last`" + junk="`cat /etc/.altboot-real-or-loop.last`" test -z "$junk" && read junk < /dev/tty1 || echo "$junk (autoboot)" else read junk < /dev/tty1 @@ -49,7 +49,7 @@ check_target() { if test "$junk" = 1 -o "$junk" = 2 then ans="$junk" - echo "$junk" > /etc/.altboot-$2-real-or-loop.last + echo "$junk" > /etc/.altboot-real-or-loop.last fi done @@ -73,6 +73,18 @@ check_target() { fi } +boot_new_rootfs_splash() { +C_RED="\033[37;44m" +C_RESET="\033[0m" + + echo -e "${C_RED}+----------------------------------------------------------+${C_RESET}" + echo -e "${C_RED}| |${C_RESET}" + echo -e "${C_RED}| Booting the selected rootfs... |${C_RESET}" + echo -e "${C_RED}| |${C_RESET}" + echo -e "${C_RED}+----------------------------------------------------------+${C_RESET}" + +} + # This function pivot_root's into a real filesystem calling $newrootfs/sbin/init # $1 = The new rootfs pivot_realfs() { @@ -137,7 +149,9 @@ pivot_image() { IMAGE_NAME="`ls *rootfs.bin`" test -z "$IMAGE_NAME" && die "No rootfs found (*rootfs.bin) in $1/$IMAGE_PATH" fi - + + + echo "" echo "Using [$IMAGE_NAME]" mkdir -p /media/image || die "mkdir -p /media/image failed" @@ -187,11 +201,11 @@ do_pivot(){ ! test -d "$new_mpt" && mkdir -p "$new_mpt" /bin/busybox mount -o move "$mpt" "$new_mpt" done - + + clear + boot_new_rootfs_splash echo "Calling INIT" - - #read junk - + exec /usr/sbin/chroot . /sbin/init $2 >/dev/tty0 2>&1 else echo "FAILED" |