From: Matthias Hentges <oe@hentges.net>
Date: Mon, 3 Apr 2006 09:54:31 +0000 (+0000)
Subject: altboot: Remove an error message when /bin/sh -> /bin/bash
X-Git-Tag: Release-2010-05/1~9453^2~2102^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d8ae3f654d70431baee403658229e900e17a847;p=openembedded.git

altboot: Remove an error message when /bin/sh -> /bin/bash
---

diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb
index 5981b41231..82314a8f22 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 = "r32"
+PR = "r33"
 
 
 SRC_URI = "file://altboot-menu \
diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot
index dc3900dcca..ed95ce1c9c 100644
--- a/packages/altboot/files/init.altboot
+++ b/packages/altboot/files/init.altboot
@@ -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