X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fmount.c;h=2b19f497f33bc77bb5129b278b0ae75aa64df654;hb=4fe60156fc45e34c7bcba4779123e15620532dff;hp=49bfd079a61c6eeba4eff28de0453620a1b6467a;hpb=33ff02c9fe84394c34c3a50c6dab85c1847a6fc7;p=elogind.git

diff --git a/src/mount.c b/src/mount.c
index 49bfd079a..2b19f497f 100644
--- a/src/mount.c
+++ b/src/mount.c
@@ -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
@@ -76,6 +80,8 @@ static void mount_init(Unit *u) {
         m->timer_watch.type = WATCH_INVALID;
 
         m->control_command_id = _MOUNT_EXEC_COMMAND_INVALID;
+
+        m->meta.ignore_on_isolate = true;
 }
 
 static void mount_unwatch_control_pid(Mount *m) {
@@ -1759,7 +1765,6 @@ const UnitVTable mount_vtable = {
 
         .no_alias = true,
         .no_instances = true,
-        .no_isolate = true,
         .show_status = true,
 
         .init = mount_init,