From fa4e07306d545859fb6c8c708c51a4d12d964123 Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Tue, 16 Dec 2008 22:09:06 +0100 Subject: fix for recursive deletes --- src/core/libs/lib-ui-interactive.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/core') diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index c1ceb3e..51133e9 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -405,8 +405,9 @@ remove_blockdevice () local part_label=$3 # must be given target="$part $part_type $part_label" - declare target_escaped=${target//\//\\/} # note: apparently no need to escape the '+' sign - fs_string=`awk "/^$target_escaped / { print \$4}" $TMP_BLOCKDEVICES` + declare target_escaped=${target//\//\\/} # note: apparently no need to escape the '+' sign for sed. + declare target_escawk=${target_escaped/+/\\+} # ...but that doesn't cound for awk + fs_string=`awk "/^$target_escawk / { print \$4}" $TMP_BLOCKDEVICES` debug "Cleaning up partition $part (type $part_type, label $part_label). It has the following FS's on it: $fs_string" sed -i "/$target_escaped/d" $TMP_BLOCKDEVICES || show_warning "blockdevice removal" "Could not remove partition $part (type $part_type, label $part_label). This is a bug. please report it" for fs in `sed 's/|/ /g' <<< $fs_string` -- cgit v1.2.3-54-g00ecf