From: Richard Jones <rjones@centos5x32.home.annexia.org>
Date: Wed, 10 Jun 2009 14:46:41 +0000 (+0100)
Subject: Merge branch 'master' of git://git.et.redhat.com/libguestfs
X-Git-Tag: 1.0.56~10
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=b7e094fa14b306fe776b9b2695cf82fa32d4923f;hp=32857b6c1686c94b3c69c88307b137997f74f23d;p=libguestfs.git

Merge branch 'master' of git://git.et.redhat.com/libguestfs
---

diff --git a/capitests/tests.c b/capitests/tests.c
index 016b78d..536da7f 100644
--- 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";
   {
+    char options[] = "ro";
+    char vfstype[] = "squashfs";
     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;
   }