X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fuse%2Fguestmount.c;h=27a4cef2e149027b06cefbfadf89ab64c4de4bc7;hb=fbf29976b33a69c64dc7847c54454bf2cfa5fde6;hp=c935493b565e7a6b4fbe2773e3ded4f80aa7ea33;hpb=a6025c11d97ed5802b3729a93d224d2baa20ff12;p=libguestfs.git

diff --git a/fuse/guestmount.c b/fuse/guestmount.c
index c935493..27a4cef 100644
--- a/fuse/guestmount.c
+++ b/fuse/guestmount.c
@@ -40,6 +40,7 @@
 #include <assert.h>
 #include <sys/time.h>
 #include <sys/types.h>
+#include <locale.h>
 
 #include <fuse.h>
 #include <guestfs.h>
@@ -927,7 +928,7 @@ main (int argc, char *argv[])
   struct mp *mps = NULL;
   struct mp *mp;
   char *p;
-  int c, i, r;
+  int c, r;
   int option_index;
   struct sigaction sa;
 
@@ -1160,10 +1161,13 @@ mount_mps (struct mp *mp)
 
   if (mp) {
     mount_mps (mp->next);
-    if (!read_only)
-      r = guestfs_mount (g, mp->device, mp->mountpoint);
-    else
-      r = guestfs_mount_ro (g, mp->device, mp->mountpoint);
+
+    /* Don't use guestfs_mount here because that will default to mount
+     * options -o sync,noatime.  For more information, see guestfs(3)
+     * section "LIBGUESTFS GOTCHAS".
+     */
+    const char *options = read_only ? "ro" : "";
+    r = guestfs_mount_options (g, options, mp->device, mp->mountpoint);
     if (r == -1)
       exit (EXIT_FAILURE);
   }