diff options
| author | Richard Jones <rjones@redhat.com> | 2010-04-30 10:51:49 +0100 |
|---|---|---|
| committer | Richard Jones <rjones@redhat.com> | 2010-04-30 10:51:49 +0100 |
| commit | c24de46d06cc3ecccf00bfaaffb06172659cdd0a (patch) | |
| tree | d1d71694d655e19e20bdcc506a4307a9e03068b3 | |
| parent | 25c15261253bbd2fb140e5ca1c902acf714f76a9 (diff) | |
| download | libguestfs-c24de46d06cc3ecccf00bfaaffb06172659cdd0a.tar.gz libguestfs-c24de46d06cc3ecccf00bfaaffb06172659cdd0a.tar.xz libguestfs-c24de46d06cc3ecccf00bfaaffb06172659cdd0a.zip | |
lvresize: Use --force so it can make LVs smaller (RHBZ#587484).
This also adds a regression test for this bug.
| -rw-r--r-- | daemon/lvm.c | 2 | ||||
| -rwxr-xr-x | src/generator.ml | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/daemon/lvm.c b/daemon/lvm.c index e44f4c26..18d6519f 100644 --- a/daemon/lvm.c +++ b/daemon/lvm.c @@ -267,7 +267,7 @@ do_lvresize (const char *logvol, int mbytes) r = command (NULL, &err, "lvm", "lvresize", - "-L", size, logvol, NULL); + "--force", "-L", size, logvol, NULL); if (r == -1) { reply_with_error ("%s", err); free (err); diff --git a/src/generator.ml b/src/generator.ml index 14cf462a..766327ee 100755 --- a/src/generator.ml +++ b/src/generator.ml @@ -2585,7 +2585,14 @@ are activated or deactivated."); ["e2fsck_f"; "/dev/VG/LV"]; ["resize2fs"; "/dev/VG/LV"]; ["mount_options"; ""; "/dev/VG/LV"; "/"]; - ["cat"; "/new"]], "test content")], + ["cat"; "/new"]], "test content"); + InitNone, Always, TestRun ( + (* Make an LV smaller to test RHBZ#587484. *) + [["part_disk"; "/dev/sda"; "mbr"]; + ["pvcreate"; "/dev/sda1"]; + ["vgcreate"; "VG"; "/dev/sda1"]; + ["lvcreate"; "LV"; "VG"; "20"]; + ["lvresize"; "/dev/VG/LV"; "10"]])], "resize an LVM logical volume", "\ This resizes (expands or shrinks) an existing LVM logical |