chiark / gitweb /
mount: fix confirm spawn setting
authorLennart Poettering <lennart@poettering.net>
Thu, 8 Jul 2010 03:22:34 +0000 (05:22 +0200)
committerLennart Poettering <lennart@poettering.net>
Thu, 8 Jul 2010 03:22:34 +0000 (05:22 +0200)
src/mount.c

index e7fdcc84f358993a8cc0aa154bd9102d9c82ef92..498732eef18d5c49b38d23600a21d4627676f79c 100644 (file)
@@ -60,10 +60,10 @@ static void mount_init(Unit *u) {
         assert(u->meta.load_state == UNIT_STUB);
 
         m->timeout_usec = DEFAULT_TIMEOUT_USEC;
         assert(u->meta.load_state == UNIT_STUB);
 
         m->timeout_usec = DEFAULT_TIMEOUT_USEC;
-        exec_context_init(&m->exec_context);
-
         m->directory_mode = 0755;
 
         m->directory_mode = 0755;
 
+        exec_context_init(&m->exec_context);
+
         /* We need to make sure that /bin/mount is always called in
          * the same process group as us, so that the autofs kernel
          * side doesn't send us another mount request while we are
         /* We need to make sure that /bin/mount is always called in
          * the same process group as us, so that the autofs kernel
          * side doesn't send us another mount request while we are
@@ -534,8 +534,8 @@ static int mount_spawn(Mount *m, ExecCommand *c, pid_t *_pid) {
                             m->meta.manager->environment,
                             true,
                             true,
                             m->meta.manager->environment,
                             true,
                             true,
-                            m->meta.manager->confirm_spawn,
                             true,
                             true,
+                            m->meta.manager->confirm_spawn,
                             m->meta.cgroup_bondings,
                             &pid)) < 0)
                 goto fail;
                             m->meta.cgroup_bondings,
                             &pid)) < 0)
                 goto fail;