]> git.openpandora.org Git - openembedded.git/commitdiff
altboot: Remove an error message when /bin/sh -> /bin/bash
authorMatthias Hentges <oe@hentges.net>
Mon, 3 Apr 2006 09:54:31 +0000 (09:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Apr 2006 09:54:31 +0000 (09:54 +0000)
packages/altboot/altboot_0.0.0.bb
packages/altboot/files/init.altboot

index 5981b412313f5019206b20d10a000c90b0f7fba1..82314a8f2215691d5ebebc5c31c889a2c96db572 100644 (file)
@@ -6,7 +6,7 @@ MAINTAINER = "Matthias 'CoreDump' Hentges  <oe@hentges.net>"
 LICENSE = "GPL"
 IGNORE_STRIP_ERRORS = "1"
 
-PR = "r32"
+PR = "r33"
 
 
 SRC_URI = "file://altboot-menu \
index dc3900dccace8d6bc7efdae529eb052bd44bd426..ed95ce1c9cd49cada310ac5076a79ceddf771050 100644 (file)
@@ -243,9 +243,13 @@ wait_for_input() {
                # above to launch the altboot menu.             
                                
                
-               # This filters an "<ENTER>" from the user as "any key"
-               ( while :; do read x< /dev/tty0 2>&1; done; ) > /dev/null 2>&1 &
-               sleep 1; kill $!
+               # Bash throws an ugly error on kill
+               if ! (readlink /bin/sh | grep -q bash)
+               then
+                       # This filters an "<ENTER>" from the user as "any key"
+                       ( while :; do read x< /dev/tty0 2>&1; done; ) > /dev/null 2>&1 &
+                       sleep 1; kill $! >/dev/null 2>&1
+               fi