diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2008-12-13 16:47:42 +0100 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2008-12-13 16:47:42 +0100 |
| commit | a0109398395ff4ef8a8ac09a007700c9fc0fe6e6 (patch) | |
| tree | 1ed0442626ede73618a8f38be2060e585742aa5e /src | |
| parent | e02df54b4f1988a7472d537837cae51ff37f6216 (diff) | |
output cleanups/fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/libs/lib-blockdevices-filesystems.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh index aba7254..316bb2c 100644 --- a/src/core/libs/lib-blockdevices-filesystems.sh +++ b/src/core/libs/lib-blockdevices-filesystems.sh @@ -461,7 +461,7 @@ process_filesystems () elif [ -b $real_part ] then infofy "Attempting destruction of device $part (type $part_type)" disks - cryptsetup luksClose $real_part || show_warning "process_filesystems blockdevice destruction" "Could not cryptsetup luksClose $real_part" + cryptsetup luksClose $real_part >$LOG || show_warning "process_filesystems blockdevice destruction" "Could not cryptsetup luksClose $real_part" else debug "Skipping destruction of device $part (type $part_type) because it doesn't exist" fi @@ -474,7 +474,7 @@ process_filesystems () elif [ -b $real_part ] then infofy "Attempting destruction of device $part (type $part_type)" disks - pvremove $real_part || show_warning "process_filesystems blockdevice destruction" "Could not pvremove $part" + pvremove $real_part >$LOG || show_warning "process_filesystems blockdevice destruction" "Could not pvremove $part" else debug "Skipping destruction of device $part (type $part_type) because it doesn't exist" fi @@ -489,14 +489,14 @@ process_filesystems () open_items=1 else infofy "Attempting destruction of device $part (type $part_type)" disks - vgremove $part || show_warning "process_filesystems blockdevice destruction" "Could not vgremove $part" # we shouldn't need -f because we clean up the lv's first. + vgremove $part >$LOG || show_warning "process_filesystems blockdevice destruction" "Could not vgremove $part" # we shouldn't need -f because we clean up the lv's first. fi else debug "Skipping destruction of device $part (type $part_type) because it doesn't exist" fi elif [ "$part_type" = lvm-lv ] #Can be in use for: dm_crypt or raw. we don't need to care about raw (it will be unmounted so it can be destroyed) then - if lvdisplay $part >/dev/null && ! vgdisplay $part | grep -q 'VG Name' # it exists: lvdisplay works, and it's not a volume group (you can do lvdisplay $volumegroup) + 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 `ls /dev/mapper/`; do cryptsetup isLuks $i >/dev/null && have_crypt=1; done @@ -507,7 +507,7 @@ process_filesystems () open_items=1 else infofy "Attempting destruction of device $part (type $part_type)" disks - lvremove -f $part || show_warning "process_filesystems blockdevice destruction" "Could not lvremove -f $part" + lvremove -f $part >$LOG || show_warning "process_filesystems blockdevice destruction" "Could not lvremove -f $part" fi else debug "Skipping destruction of device $part (type $part_type) because it doesn't exist" |