summaryrefslogtreecommitdiffstats
path: root/scripts/contrib
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2013-04-25 14:27:29 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-02 17:41:55 +0100
commitc09866b4cf9f43aadd997dd33016979b07d1c130 (patch)
tree294d9296c1ec90403a3d92a83c577ef0083ff467 /scripts/contrib
parent8d3285f99b685eb08399b037b49fe5d8270fd589 (diff)
downloadpoky-c09866b4cf9f43aadd997dd33016979b07d1c130.tar.gz
mkefidisk: Unmount after partitioning
Some automounters are rather overzealous and like to mount things immediately after partitioning. This can happen if the disk is being reused and the partitions align exactly with the existing partitions which have already been formatted. Move the unmount code into a function and call it before and after partitioning. (From OE-Core rev: f1854e458e5e77806b1fc837033500fa91272261) Signed-off-by: Darren Hart <dvhart@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/contrib')
-rwxr-xr-xscripts/contrib/mkefidisk.sh32
1 files changed, 21 insertions, 11 deletions
diff --git a/scripts/contrib/mkefidisk.sh b/scripts/contrib/mkefidisk.sh
index 741c3ab967..0c15104bb3 100755
--- a/scripts/contrib/mkefidisk.sh
+++ b/scripts/contrib/mkefidisk.sh
@@ -71,6 +71,20 @@ function device_details() {
71 echo "" 71 echo ""
72} 72}
73 73
74function unmount_device() {
75 grep -q $DEVICE /proc/mounts
76 if [ $? -eq 0 ]; then
77 echo -n "$DEVICE listed in /proc/mounts, attempting to unmount..."
78 umount $DEVICE* 2>/dev/null
79 grep -q $DEVICE /proc/mounts
80 if [ $? -eq 0 ]; then
81 echo "FAILED"
82 exit 1
83 fi
84 echo "OK"
85 fi
86}
87
74 88
75# 89#
76# Parse and validate arguments 90# Parse and validate arguments
@@ -100,17 +114,7 @@ fi
100# 114#
101# Check if any $DEVICE partitions are mounted 115# Check if any $DEVICE partitions are mounted
102# 116#
103grep -q $DEVICE /proc/mounts 117unmount_device
104if [ $? -eq 0 ]; then
105 echo -n "$DEVICE listed in /proc/mounts, attempting to unmount..."
106 umount $DEVICE* 2>/dev/null
107 grep -q $DEVICE /proc/mounts
108 if [ $? -eq 0 ]; then
109 echo "FAILED"
110 exit 1
111 fi
112 echo "OK"
113fi
114 118
115 119
116# 120#
@@ -183,6 +187,12 @@ parted $DEVICE print
183 187
184 188
185# 189#
190# Check if any $DEVICE partitions are mounted after partitioning
191#
192unmount_device
193
194
195#
186# Format $DEVICE partitions 196# Format $DEVICE partitions
187# 197#
188echo "" 198echo ""