summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Boor <florian.boor@kernelconcepts.de>2006-01-13 22:50:24 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-01-13 22:50:24 +0000
commit7896470157b166dcceee2fc8a513e125fb73ec45 (patch)
treebff8aca8dcd82ef9d18bdc54783a2713398caddf
parent940e3a86f1bcc4b8cb373a39c5646ac1de1b6160 (diff)
parent308ca12370f485243e31dea49bf3d98dde33c901 (diff)
merge of 94dc534986dc5c018c2c127e01fa7cac5f51270a
and e118e6eeb9d00fb7d7577c8cfdea6ed409fdc2a9
-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 $*