summaryrefslogtreecommitdiffstats
path: root/scripts/contrib
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-04-21 14:01:55 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-27 15:20:38 +0100
commit50623fd78c962f3f23d49be2ab16ee24035e5fe4 (patch)
tree2fbce208b3d025fd14190b96b934438ed45c5788 /scripts/contrib
parent4d5c8758107467ca873f635b5b46ebc38d7f0b7d (diff)
downloadpoky-50623fd78c962f3f23d49be2ab16ee24035e5fe4.tar.gz
mkefidisk.sh: fix hanging on non-writeable device
If cleanup() is called early on, as happens when the device isn't writeable, then none of the mount point variables are set; thus the script was calling grep with only one argument and appeared to hang since it was waiting for input on stdin. (From OE-Core rev: cf4a18eec2a65d840352d1a2862242d116e8a409) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/contrib')
-rwxr-xr-xscripts/contrib/mkefidisk.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/contrib/mkefidisk.sh b/scripts/contrib/mkefidisk.sh
index 74cf40d551..d6bc965137 100755
--- a/scripts/contrib/mkefidisk.sh
+++ b/scripts/contrib/mkefidisk.sh
@@ -136,6 +136,9 @@ unmount_device() {
136} 136}
137 137
138unmount() { 138unmount() {
139 if [ "$1" = "" ] ; then
140 return 0
141 fi
139 grep -q $1 /proc/mounts 142 grep -q $1 /proc/mounts
140 if [ $? -eq 0 ]; then 143 if [ $? -eq 0 ]; then
141 debug "Unmounting $1" 144 debug "Unmounting $1"