X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fsync.c;h=a09c8c15da9ddda552ffa83e3c1bbaab282af529;hp=25c7de894908152fcbef4f35d6fa68d135391383;hb=19005b2cfc6b077aafd16cb5b97a08180e4e39f8;hpb=d2636b0984830d950423dadd936114ff242c4a00

diff --git a/daemon/sync.c b/daemon/sync.c
index 25c7de8..a09c8c1 100644
--- a/daemon/sync.c
+++ b/daemon/sync.c
@@ -1,5 +1,5 @@
 /* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009-2011 Red Hat Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -51,9 +51,10 @@ do_sync (void)
 int
 do_internal_autosync (void)
 {
-  int r;
+  int r = 0;
 
-  r = do_umount_all ();
+  if (autosync_umount)
+    r = do_umount_all ();
 
   sync_disks ();
 
@@ -102,9 +103,6 @@ sync_win32 (void)
     HANDLE drive;
     DWORD drive_type;
 
-    if (verbose)
-      fprintf (stderr, "sync_win32: examining drive %s\n", p);
-
     /* Ignore removable drives. */
     drive_type = GetDriveType (p);
     if (drive_type == DRIVE_FIXED) {
@@ -121,8 +119,6 @@ sync_win32 (void)
                           NULL, OPEN_EXISTING, 0, 0);
       if (drive == INVALID_HANDLE_VALUE)
         return -1;
-      if (verbose)
-        fprintf (stderr, "sync_win32: flushing %s\n", volname);
 
       BOOL r;
       /* This always fails in Wine: