@@ -1,3 +1,11 @@

+chiark-utils (4.0.99.0.15) unstable; urgency=low
+
+  * /etc/chiark-backup/snap/lvm (backup/lvm in the source tree) now
+    limits the snapshot size to 1.1x the original lv size (rounded down,
+    ish), as lvcreate has this as an undocumented restriction.
+
+ --
+
 chiark-utils (4.0.99.0.14) unstable; urgency=low

   * /etc/chiark-backup/snap/lvm (backup/lvm in the source tree) now uses

diff --git a/backup/examples/chiark/settings.sh b/backup/examples/chiark/settings.sh
index 9544a2ded5a6fc2f92ec7fdc847319102904982c..e7ac2dc8bd22a52a64ede03eaa8971408e4565e5 100755 (executable)
--- a/backup/examples/chiark/settings.sh
+++ b/backup/examples/chiark/settings.sh
@@ -1,7 +1,7 @@
 # shell script fragment setting options
 # defaults for currently implemented parameters are
 #lvm_lv=chiark_backup
-#lvm_lvsize_opts=-l <no. of free extents in vg>
+#lvm_lvsize_opts=-l <min(no. of free extents in vg, 1.1x total lv size)>
 #lvm_lvtools_opts='-A n'
 #lvm_lvcreate_opts=
 #lvm_lvcreate_args=

diff --git a/backup/lvm b/backup/lvm
index 4d897e71ae77a2bc00cd477a212bf44ee6bd4eb5..5389e7b08a2a1d5efe0e1c6203b9967f4ceb55ad 100755 (executable)
--- a/backup/lvm
+++ b/backup/lvm
@@ -67,6 +67,13 @@ if [ -z "$lvm_lvsize_opts" ]; then
        vggroup="${vggroup%/*}"
        vgdisplay_out="$(really vgdisplay -c "$vggroup")"
        extents="$(printf "%s" "$vgdisplay_out" | awk -F: '{print $16}')"
+
+       lvdisplay_out="$(really lvdisplay -c "$device")"
+       extents2="$(printf "%s" "$lvdisplay_out" | awk -F: '{print $9}')"
+       extents2=$(( $extents2 + ($extents2+9)/10 - 1 ))
+
+       if [ $extents2 -lt $extents ]; then extents=$extents2; fi
+
        lvm_lvsize_opts="-l $extents"
 fi
 

diff --git a/debian/changelog b/debian/changelog
index d837f924e9cbf3caa2801850ecbc97b82e84f1af..af48e58fbdf93a00c6d71c641bbd6e2ed5c47cd4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+chiark-utils (4.0.99.0.15) unstable; urgency=low
+
+  * /etc/chiark-backup/snap/lvm (backup/lvm in the source tree) now
+    limits the snapshot size to 1.1x the original lv size (rounded down,
+    ish), as lvcreate has this as an undocumented restriction.
+
+ --
+
 chiark-utils (4.0.99.0.14) unstable; urgency=low
 
   * /etc/chiark-backup/snap/lvm (backup/lvm in the source tree) now uses