From 988c2e74ad5e2f169d26e02c961f97bbb8ac2381 Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Tue, 16 Dec 2008 18:32:00 +0100 Subject: fix for delete LV --- src/core/libs/lib-blockdevices-filesystems.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src') diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh index cff37ef..6cb290c 100644 --- a/src/core/libs/lib-blockdevices-filesystems.sh +++ b/src/core/libs/lib-blockdevices-filesystems.sh @@ -568,11 +568,7 @@ rollback_filesystems () then if lvdisplay $part >/dev/null && ! vgdisplay $part 2>/dev/null | grep -q 'VG Name' # it exists: lvdisplay works, and it's not a volume group (you can do lvdisplay $volumegroup) then - have_crypt=0 - for i in `awk '$2 ~ /dm_crypt/ {print $1}' $TMP_BLOCKDEVICES`; do cryptsetup status $i >/dev/null && have_crypt=1; done - # TODO: Find a way to determine if a volume is used for a dm_crypt device. - # this is a workaround that checks if any of the specified dm_crypts is still active. These devices may not be using this lvm LV, but we don't do much harm in skipping anyway. The dm_crypts should be cleared otherwise there's a problem anyway. - if [ $have_crypt -gt 0 ] + if cryptsetup isLuks $part &>/dev/null then debug "$part ->Cannot do right now..." open_items=1 -- cgit v1.2.3-54-g00ecf