diff options
| author | Philipp Zabel <philipp.zabel@gmail.com> | 2006-03-01 18:28:10 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-03-01 18:28:10 +0000 |
| commit | 288d131871a9b7e7857bfdb8556fd1a41f5259e8 (patch) | |
| tree | c0eba71cd1ce8cce2e9bf9d08bba84068e5a86d9 | |
| parent | 2fb5f01e23b04e171d4dea6e5d1af5640386efac (diff) | |
| parent | ca83ab4389e988210ab0691dfd4dc29f54e6dfb6 (diff) | |
merge of 6e871c66a3a79d4cb65e5784eace4cb7896df590
and f16c11d524e85958fbc2b3ec749e166ed4669741
| -rw-r--r-- | packages/altboot/altboot_0.0.0.bb | 2 | ||||
| -rw-r--r-- | packages/altboot/files/altboot-menu/Advanced/70-install-tgz | 4 | ||||
| -rw-r--r-- | packages/altboot/files/altboot.func | 2 | ||||
| -rw-r--r-- | packages/altboot/files/altboot.rc/loadkeymap.sh | 5 |
4 files changed, 8 insertions, 5 deletions
diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb index e52070c817..6aaa7ead05 100644 --- a/packages/altboot/altboot_0.0.0.bb +++ b/packages/altboot/altboot_0.0.0.bb @@ -6,7 +6,7 @@ MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" LICENSE = "GPL" IGNORE_STRIP_ERRORS = "1" -PR = "r24" +PR = "r25" SRC_URI = "file://altboot-menu \ diff --git a/packages/altboot/files/altboot-menu/Advanced/70-install-tgz b/packages/altboot/files/altboot-menu/Advanced/70-install-tgz index 2ae44fa890..cdfa052747 100644 --- a/packages/altboot/files/altboot-menu/Advanced/70-install-tgz +++ b/packages/altboot/files/altboot-menu/Advanced/70-install-tgz @@ -141,7 +141,7 @@ install_rootfs_direct(){ sync echo "done" - umount "$1" +# umount "$1" echo "Press <ENTER> to bring up the altboot menu" read junk </dev/tty0 >/dev/tty0 2>&1 @@ -210,7 +210,7 @@ install_rootfs_image(){ if test -n "$junk" then - if test "$junk" -gt 30 + if test "$junk" -gt 29 then echo -n "Is [${junk}Mb] correct? [Y|n] " read junk2 diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func index d7737ece96..c6af50a008 100644 --- a/packages/altboot/files/altboot.func +++ b/packages/altboot/files/altboot.func @@ -312,7 +312,7 @@ init_rootfs(){ } mount_sd(){ - if mount | grep -q "/media/card " + if mount | grep -q "/media/card" then echo "Note: /media/card is already mounted" else diff --git a/packages/altboot/files/altboot.rc/loadkeymap.sh b/packages/altboot/files/altboot.rc/loadkeymap.sh index f9a7774549..97cff13dbb 100644 --- a/packages/altboot/files/altboot.rc/loadkeymap.sh +++ b/packages/altboot/files/altboot.rc/loadkeymap.sh @@ -1,5 +1,8 @@ #!/bin/sh # Note: With kernel 2.6 the standard keymap is unusable -test -x /etc/init.d/keymap && /etc/init.d/keymap start >/dev/null 2>&1 +test -x /etc/init.d/keymap && /etc/init.d/keymap start >/dev/null 2>&1 + +# Do not exit w/ errorcode when the if above fails +/bin/true |