                          r = -ENOMEM;
                          goto finish;
                  }
-@@ -180,7 +179,6 @@
+@@ -205,7 +204,6 @@
                  p.fatal = false;
  
-                 r = mount_one(&p);
+                 r = mount_one(&p, true);
 -                free(controller);
                  free(where);
  
                  if (r < 0)
 Index: git/src/socket-util.c
 ===================================================================
---- git.orig/src/socket-util.c	2011-07-03 08:24:43.892018457 -0700
-+++ git/src/socket-util.c	2011-07-03 08:25:38.242098176 -0700
+--- git.orig/src/socket-util.c	2011-08-02 11:28:04.000000000 -0700
++++ git/src/socket-util.c	2011-08-02 11:28:16.178773302 -0700
 @@ -192,7 +192,7 @@
  int socket_address_parse_netlink(SocketAddress *a, const char *s) {
          int family;

         free(o);
Index: git/src/umount.c
===================================================================
--- git.orig/src/umount.c	2011-07-03 08:24:43.892018457 -0700
+++ git/src/umount.c	2011-07-03 08:33:06.732755969 -0700
@@ -60,7 +60,9 @@
 
 static int mount_points_list_get(MountPoint **head) {

 
Index: git/src/mount.c
===================================================================
--- git.orig/src/mount.c	2011-08-02 11:28:04.000000000 -0700
+++ git/src/mount.c	2011-08-02 11:28:16.488773760 -0700
@@ -24,6 +24,7 @@
 #include <mntent.h>
 #include <sys/epoll.h>
