Revert "fishdescriptor: for revert: attempt at setuptools"

[chiark-utils.git] / backup / lvm

diff --git a/backup/lvm b/backup/lvm
index 3d8be29e782a348bfa2a5f8d22f407caf1dee0ac..c9ed222142246981889f912378d23a21509132f8 100755 (executable)
--- a/backup/lvm
+++ b/backup/lvm
@@ -7,7 +7,7 @@
 
 set -e
 snapkind=lvm
-. /usr/share/chiark-backup/snap-common
+. ${CHIARK_BACKUP_SHAREDIR:-/usr/share/chiark-backup}/snap-common
 
 #---------- clean up anything
 
@@ -23,13 +23,14 @@ fi
 fstype="$(mount | sed -n \
  "s,^$device on $mountpoint type \([a-z0-9][a-z0-9]*\) .*,-t \1 ,p")"
 
+lvmunmapperdevice
+lvmdevice2vgroup
+
 if [ -z "$lvm_lvsize_opts" ]; then
-       vgroup="${device#/dev/}"
-       vgroup="${vgroup%/*}"
        lvmextentscore1
 
        lvdisplay_out="$(really lvdisplay -c "$device")"
-       extents2="$(printf "%s" "$lvdisplay_out" | awk -F: '{print $9}')"
+       extents2="$(printf "%s" "$lvdisplay_out" | awk -F: '{print $8}')"
        extents2=$(( $extents2 + ($extents2+9)/10 - 1 ))
 
        lvmextentscore2