Remove obsolete comment from generator.

diff --git a/capitests/tests.c b/capitests/tests.c
index 016b78d..536da7f 100644 (file)
--- a/capitests/tests.c
+++ b/capitests/tests.c
@@ -5794,11 +5794,13 @@ static int test_checksum_8 (void)
   /* TestOutput for checksum (8) */
   char expected[] = "46d6ca27ee07cdc6fa99c2e138cc522c";
   {
   /* TestOutput for checksum (8) */
   char expected[] = "46d6ca27ee07cdc6fa99c2e138cc522c";
   {

+    char options[] = "ro";
+    char vfstype[] = "squashfs";

     char device[] = "/dev/sdd";
     char mountpoint[] = "/";
     int r;
     suppress_error = 0;
     char device[] = "/dev/sdd";
     char mountpoint[] = "/";
     int r;
     suppress_error = 0;

-    r = guestfs_mount (g, device, mountpoint);
+    r = guestfs_mount_vfs (g, options, vfstype, device, mountpoint);

     if (r == -1)
       return -1;
   }
     if (r == -1)
       return -1;
   }

diff --git a/src/generator.ml b/src/generator.ml
index 27ecb51..b3f27cd 100755 (executable)
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -143,13 +143,6 @@ can easily destroy all your data>."
  *
  * Between each test we blockdev-setrw, umount-all, lvm-remove-all.
  *
  *
  * Between each test we blockdev-setrw, umount-all, lvm-remove-all.
  *

- * If the appliance is running an older Linux kernel (eg. RHEL 5) then
- * devices are named /dev/hda etc.  To cope with this, the test suite
- * adds some hairly logic to detect this case, and then automagically
- * replaces all strings which match "/dev/sd.*" with "/dev/hd.*".
- * When writing test cases you shouldn't have to worry about this
- * difference.
- *

  * Don't assume anything about the previous contents of the block
  * devices.  Use 'Init*' to create some initial scenarios.
  *
  * Don't assume anything about the previous contents of the block
  * devices.  Use 'Init*' to create some initial scenarios.
  *