[pkg-fso-commits] [SCM] Various non-packaged files branch, master, updated. 24f2b99f573fb16d5a18f1e9668f75186732ae21

[Jonas Smedegaard]

The following commit has been merged in the master branch:
commit 24f2b99f573fb16d5a18f1e9668f75186732ae21
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Mar 6 21:36:53 2010 +0100

    Fix avoid broken read on OM: invoke in subshell. Thanks to Michael Tomschitz.

diff --git a/install.sh b/install.sh
index 5765712..7a0ae17 100755
--- a/install.sh
+++ b/install.sh
@@ -228,7 +228,7 @@ five_seconds_to_quit () {
 	# since dash doesn't support 'read' -t and -n options, this script
 	# should be executed only by /bin/bash.  However, all official
 	# Openmoko images use busybox, which doesn't provide /bin/bash
-	read -t 5 -n 1 intern_var || intern_var=continue
+	intern_var=$(read -t 5 -n 1 intern_var || intern_var=continue; echo $intern_var)
 	if [ "$intern_var" != "continue" ]; then
 		echo "E: aborting on user request"
 		exit 1

-- 
Various non-packaged files