summaryrefslogtreecommitdiffstats
path: root/meta-phosphor/common/recipes-phosphor/flash
diff options
context:
space:
mode:
authorSaqib Khan <khansa@us.ibm.com>2017-09-07 13:57:43 -0500
committerSaqib Khan <khansa@us.ibm.com>2017-09-07 14:00:52 -0500
commit8bc982072b26f83536db2c0b61176294f752c568 (patch)
tree402737cf5d48aa6dc9552b4ebea46f14b39a657d /meta-phosphor/common/recipes-phosphor/flash
parentd52be1e604c8cb0f24ee7ebad1f8186698db91f4 (diff)
downloadtalos-openbmc-8bc982072b26f83536db2c0b61176294f752c568.tar.gz
talos-openbmc-8bc982072b26f83536db2c0b61176294f752c568.zip
Fix the function that is responsible for deleting bmc ubi volumes
- The current script was checking for ubi4:rofs-<versionId> inside /proc/mount but it is listed as /media/rofs-<versionId>. Therefore the service files that removes the ubi volumes were failing. Change-Id: Ie715e4b82d1e9c15708318cae367636d26642af3 Signed-off-by: Saqib Khan <khansa@us.ibm.com>
Diffstat (limited to 'meta-phosphor/common/recipes-phosphor/flash')
-rw-r--r--meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc
index 4c32ab4f8..60e976be3 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc
+++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc
@@ -161,8 +161,8 @@ ubi_remove() {
if [ ! -z "$vol" ]; then
vol="${vol%_*}"
- if grep -q "${vol}:$rmname" /proc/mounts; then
- mountdir=$(grep "${vol}:$rmname" /proc/mounts | cut -d " " -f 2)
+ if grep -q "$rmname" /proc/mounts; then
+ mountdir=$(grep "$rmname" /proc/mounts | cut -d " " -f 2)
umount "$mountdir"
rm -r "$mountdir"
fi
OpenPOWER on IntegriCloud