summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2006-01-13 23:00:25 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-01-13 23:00:25 +0000
commit3f33387bc82e8eb58d073b9fa39c27c2db3bcf8b (patch)
treec10ed4fb8c93823961b368df6f5d7700d26133e5 /packages
parent1dc43aae3865d972ad7873ab841a77a0d96472b1 (diff)
parent308ca12370f485243e31dea49bf3d98dde33c901 (diff)
merge of 94dc534986dc5c018c2c127e01fa7cac5f51270a
and d64372f18fedb4c3445dc88accadfe7e01613642
Diffstat (limited to 'packages')
-rw-r--r--packages/altboot/altboot.bb2
-rw-r--r--packages/altboot/files/init.altboot2
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/altboot/altboot.bb b/packages/altboot/altboot.bb
index a322dacdd9..de5d780579 100644
--- a/packages/altboot/altboot.bb
+++ b/packages/altboot/altboot.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
LICENSE = "GPL"
-PR = "r8"
+PR = "r9"
SRC_URI = "file://altboot-menu \
diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot
index 5c28edb5f3..2b7df14c86 100644
--- a/packages/altboot/files/init.altboot
+++ b/packages/altboot/files/init.altboot
@@ -243,7 +243,7 @@ wait_for_input() {
# * * * * * * This is the main function * * * * * *
-if ! test -z "$*"
+if test -n "$*" -a "$*" != "tty1"
then
echo "altboot: Using real init [$REAL_INIT] [$*] *" >/dev/tty1
exec $REAL_INIT $*