openstack/diskimage-builder
Code Issues Proposed changes

Merge "Properly account for pipefail during cleanup"

Browse Source
This commit is contained in:
Jenkins 2016-01-08 01:23:59 +00:00 committed by Gerrit Code Review
commit beae0b21f1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/common-functions
View File

@ -208,8 +208,9 @@ function detach_loopback() {
# If setup on a rhel or derivative the map was created with kpartx not losetup # If setup on a rhel or derivative the map was created with kpartx not losetup
# and subsequently needs to be removed. # and subsequently needs to be removed.
loopdev_name=$(echo $loopdev | sed 's/\/dev\///g') loopdev_name=$(echo $loopdev | sed 's/\/dev\///g')
mapper_name=$(sudo dmsetup ls | grep $loopdev_name | awk '{ print $1 }')
if [ "$mapper_name" ]; then if sudo dmsetup ls | grep $loopdev_name; then
mapper_name=$(sudo dmsetup ls | grep $loopdev_name | awk '{ print $1 }')
sudo dmsetup --noudevsync remove $mapper_name sudo dmsetup --noudevsync remove $mapper_name
fi fi
@ -282,7 +283,7 @@ function mount_proc_dev_sys () {
function unmount_dir () { function unmount_dir () {
local pattern="$1" mnts="" local pattern="$1" mnts=""
if [ -n "$pattern" ]; then if [ -n "$pattern" ] && awk '{print $2}' < /proc/mounts | grep "^$pattern"; then
mnts=`awk '{print $2}' < /proc/mounts | grep "^$pattern" | sort -r` mnts=`awk '{print $2}' < /proc/mounts | grep "^$pattern" | sort -r`
fi fi
if [ -n "$mnts" ]; then if [ -n "$mnts" ]; then