[Libguestfs] [PATCH] Fix swapon_label test

Matthew Booth mbooth at redhat.com
Wed Aug 5 08:35:43 UTC 2009


The swapon label test has a side-effect, in that it creates a new partition.
This causes the later failure of the list_partitions test.

This change causes the swapon_label test to scrub /dev/sdb after the test, and
then re-read the partition table.
---
 src/generator.ml |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/generator.ml b/src/generator.ml
index 9ef99bd..fe538a6 100755
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -3254,7 +3254,9 @@ This command disables the libguestfs appliance swap on file.");
       [["sfdiskM"; "/dev/sdb"; ","];
        ["mkswap_L"; "swapit"; "/dev/sdb1"];
        ["swapon_label"; "swapit"];
-       ["swapoff_label"; "swapit"]])],
+       ["swapoff_label"; "swapit"];
+       ["scrub_device"; "/dev/sdb"];
+       ["blockdev_rereadpt"; "/dev/sdb"]])],
    "enable swap on labelled swap partition",
    "\
 This command enables swap to a labelled swap partition.
-- 
1.6.2.5




More information about the Libguestfs mailing list