chiark / gitweb /
mount: don't pull in stdio logger for root mount unit
authorLennart Poettering <lennart@poettering.net>
Wed, 13 Apr 2011 02:34:35 +0000 (04:34 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 13 Apr 2011 02:34:35 +0000 (04:34 +0200)
src/mount.c

index 49bfd079a61c6eeba4eff28de0453620a1b6467a..d7a300e796b0674d03e3d276b34e851400ad6e49 100644 (file)
@@ -65,7 +65,11 @@ static void mount_init(Unit *u) {
         m->directory_mode = 0755;
 
         exec_context_init(&m->exec_context);
-        m->exec_context.std_output = EXEC_OUTPUT_KMSG;
+
+        /* The stdio/kmsg bridge socket is on /, in order to avoid a
+         * dep loop, don't use kmsg logging for -.mount */
+        if (!unit_has_name(u, "-.mount"))
+                m->exec_context.std_output = EXEC_OUTPUT_KMSG;
 
         /* We need to make sure that /bin/mount is always called in
          * the same process group as us, so that the autofs kernel