From: Matthew Booth <mbooth@redhat.com>
Date: Mon, 3 Aug 2009 19:29:24 +0000 (+0100)
Subject: Fix swapon_label test
X-Git-Tag: 1.0.66~16
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=8eb7f1a58f424ad0f210fe638574b5067d2ac97b;p=libguestfs.git

Fix swapon_label test

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 zero /dev/sdb after the test, and
then re-read the partition table.
---

diff --git a/src/generator.ml b/src/generator.ml
index c9b3315..94dc268 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"];
+       ["zero"; "/dev/sdb"];
+       ["blockdev_rereadpt"; "/dev/sdb"]])],
    "enable swap on labelled swap partition",
    "\
 This command enables swap to a labelled swap partition.