Replace mount-options with mount where appropriate.

Since our minimum supported version is now 1.16 and mount was fixed in
1.13.16, it is now safe to replace mount-options + empty options with
mount wherever it occurs.

10 files changed, 20 insertions, 20 deletions

diff --git a/tests/c-api/test-last-errno.c b/tests/c-api/test-last-errno.c
index 49ec556d..b515624f 100644
--- a/tests/c-api/test-last-errno.c
+++ b/tests/c-api/test-last-errno.c
@@ -104,7 +104,7 @@ main (int argc, char *argv[])
     exit (EXIT_FAILURE);
 
   /* Mount it writable and test some other errors. */
-  if (guestfs_mount_options (g, "", "/dev/sda1", "/") == -1)
+  if (guestfs_mount (g, "/dev/sda1", "/") == -1)
     exit (EXIT_FAILURE);
 
   stat = guestfs_lstat (g, "/nosuchfile");
diff --git a/tests/c-api/test-user-cancel.c b/tests/c-api/test-user-cancel.c
index fa860f5d..8bc2fc20 100644
--- a/tests/c-api/test-user-cancel.c
+++ b/tests/c-api/test-user-cancel.c
@@ -126,7 +126,7 @@ main (int argc, char *argv[])
   if (guestfs_mkfs (g, "ext2", "/dev/sda1") == -1)
     exit (EXIT_FAILURE);
 
-  if (guestfs_mount_options (g, "", "/dev/sda1", "/") == -1)
+  if (guestfs_mount (g, "/dev/sda1", "/") == -1)
     exit (EXIT_FAILURE);
 
   /*----- Upload cancellation test -----*/
diff --git a/tests/guests/guest-aux/make-debian-img.sh b/tests/guests/guest-aux/make-debian-img.sh
index 74e9f59c..76d81d39 100755
--- a/tests/guests/guest-aux/make-debian-img.sh
+++ b/tests/guests/guest-aux/make-debian-img.sh
@@ -63,15 +63,15 @@ mkfs ext2 /dev/debian/home blocksize:4096
 set-e2uuid /dev/debian/home 01234567-0123-0123-0123-012345678905
 
 # Enough to fool inspection API.
-mount-options "" /dev/debian/root /
+mount /dev/debian/root /
 mkdir /boot
-mount-options "" /dev/sda1 /boot
+mount /dev/sda1 /boot
 mkdir /usr
-mount-options "" /dev/debian/usr /usr
+mount /dev/debian/usr /usr
 mkdir /var
-mount-options "" /dev/debian/var /var
+mount /dev/debian/var /var
 mkdir /home
-mount-options "" /dev/debian/home /home
+mount /dev/debian/home /home
 mkdir /bin
 mkdir /etc
 mkdir-p /var/lib/dpkg
diff --git a/tests/guests/guest-aux/make-fedora-img.pl b/tests/guests/guest-aux/make-fedora-img.pl
index 9991b73d..3272d4c7 100755
--- a/tests/guests/guest-aux/make-fedora-img.pl
+++ b/tests/guests/guest-aux/make-fedora-img.pl
@@ -135,9 +135,9 @@ $g->set_label ('/dev/VG/Root', 'ROOT');
 $g->set_e2uuid ('/dev/VG/Root', '01234567-0123-0123-0123-012345678902');
 
 # Enough to fool inspection API.
-$g->mount_options ('', '/dev/VG/Root', '/');
+$g->mount ('/dev/VG/Root', '/');
 $g->mkdir ('/boot');
-$g->mount_options ('', $bootdev, '/boot');
+$g->mount ($bootdev, '/boot');
 $g->mkdir ('/bin');
 $g->mkdir ('/etc');
 $g->mkdir ('/etc/sysconfig');
diff --git a/tests/guests/guest-aux/make-ubuntu-img.sh b/tests/guests/guest-aux/make-ubuntu-img.sh
index 50bae439..eec80f91 100755
--- a/tests/guests/guest-aux/make-ubuntu-img.sh
+++ b/tests/guests/guest-aux/make-ubuntu-img.sh
@@ -58,9 +58,9 @@ mkfs ext2 /dev/sda2 blocksize:4096
 set-e2uuid /dev/sda2 01234567-0123-0123-0123-012345678902
 
 # Enough to fool inspection API.
-mount-options "" /dev/sda2 /
+mount /dev/sda2 /
 mkdir /boot
-mount-options "" /dev/sda1 /boot
+mount /dev/sda1 /boot
 mkdir /bin
 mkdir /etc
 mkdir /home
diff --git a/tests/guests/guest-aux/make-windows-img.sh b/tests/guests/guest-aux/make-windows-img.sh
index 521fde2c..860ec060 100755
--- a/tests/guests/guest-aux/make-windows-img.sh
+++ b/tests/guests/guest-aux/make-windows-img.sh
@@ -55,7 +55,7 @@ mkfs ntfs /dev/sda1
 mkfs ntfs /dev/sda2
 
 # Enough to fool inspection API.
-mount-options "" /dev/sda2 /
+mount /dev/sda2 /
 mkdir-p /Windows/System32/Config
 
 upload $SRCDIR/guest-aux/windows-software /Windows/System32/Config/SOFTWARE
diff --git a/tests/md/test-inspect-fstab-md.sh b/tests/md/test-inspect-fstab-md.sh
index bd29c310..31a91a56 100755
--- a/tests/md/test-inspect-fstab-md.sh
+++ b/tests/md/test-inspect-fstab-md.sh
@@ -60,7 +60,7 @@ EOF
 
 $guestfish -a test1.img -a test2.img <<'EOF'
   run
-  mount-options "" /dev/VG/Root /
+  mount /dev/VG/Root /
   upload test.fstab /etc/fstab
 EOF
 
diff --git a/tests/md/test-inspect-fstab.sh b/tests/md/test-inspect-fstab.sh
index 889ceee0..dff27602 100755
--- a/tests/md/test-inspect-fstab.sh
+++ b/tests/md/test-inspect-fstab.sh
@@ -51,7 +51,7 @@ EOF
 
 $guestfish -a test1.qcow2 <<'EOF'
   run
-  mount-options "" /dev/VG/Root /
+  mount /dev/VG/Root /
   upload test.fstab /etc/fstab
 EOF
 
@@ -83,7 +83,7 @@ EOF
 
 $guestfish -a test1.qcow2 <<'EOF'
   run
-  mount-options "" /dev/VG/Root /
+  mount /dev/VG/Root /
   upload test.fstab /etc/fstab
 EOF
 
@@ -114,7 +114,7 @@ EOF
 
 $guestfish -a test1.qcow2 <<'EOF'
   run
-  mount-options "" /dev/VG/Root /
+  mount /dev/VG/Root /
   upload test.fstab /etc/fstab
 EOF
 
diff --git a/tests/protocol/test-cancellation-download-librarycancels.sh b/tests/protocol/test-cancellation-download-librarycancels.sh
index a1198c4a..0518f636 100755
--- a/tests/protocol/test-cancellation-download-librarycancels.sh
+++ b/tests/protocol/test-cancellation-download-librarycancels.sh
@@ -38,7 +38,7 @@ run
 
 part-disk /dev/sda mbr
 mkfs ext2 /dev/sda1
-mount-options "" /dev/sda1 /
+mount /dev/sda1 /
 
 fallocate64 /file $size
 
diff --git a/tests/qemu/qemu-snapshot-isolation.sh b/tests/qemu/qemu-snapshot-isolation.sh
index 17e3bab4..aae177c0 100755
--- a/tests/qemu/qemu-snapshot-isolation.sh
+++ b/tests/qemu/qemu-snapshot-isolation.sh
@@ -51,11 +51,11 @@ lvcreate LV VG 80
 mkfs ext3 /dev/VG/LV
 
 mkmountpoint /a
-mount-options "" /dev/sda1 /a
+mount /dev/sda1 /a
 mkmountpoint /b
-mount-options "" /dev/sdb1 /b
+mount /dev/sdb1 /b
 mkmountpoint /c
-mount-options "" /dev/VG/LV /c
+mount /dev/VG/LV /c
 
 write /a/test "This is a test"
 write /b/test "This is a test"