|
Zbigniew Jędrzejewski-Szmek |
d66047 |
From c74cf7621353d765a89e800c5a040fefa79e7915 Mon Sep 17 00:00:00 2001
|
|
Zbigniew Jędrzejewski-Szmek |
d66047 |
From: Lennart Poettering <lennart@poettering.net>
|
|
Zbigniew Jędrzejewski-Szmek |
d66047 |
Date: Wed, 20 Nov 2013 03:44:11 +0100
|
|
Zbigniew Jędrzejewski-Szmek |
d66047 |
Subject: [PATCH] manager: don't do plymouth in a container
|
|
Zbigniew Jędrzejewski-Szmek |
d66047 |
|
|
Zbigniew Jędrzejewski-Szmek |
d66047 |
Given that plymouth listens on an abstract namespace socket and if
|
|
Zbigniew Jędrzejewski-Szmek |
d66047 |
CLONE_NEWNET is not used the abstract namespace is shared with the host
|
|
Zbigniew Jędrzejewski-Szmek |
d66047 |
we might actually end up send plymouth data to the host.
|
|
Zbigniew Jędrzejewski-Szmek |
d66047 |
---
|
|
Zbigniew Jędrzejewski-Szmek |
d66047 |
src/core/manager.c | 3 +++
|
|
Zbigniew Jędrzejewski-Szmek |
d66047 |
1 file changed, 3 insertions(+)
|
|
Zbigniew Jędrzejewski-Szmek |
d66047 |
|
|
Zbigniew Jędrzejewski-Szmek |
d66047 |
diff --git a/src/core/manager.c b/src/core/manager.c
|
|
Zbigniew Jędrzejewski-Szmek |
d66047 |
index ce32baf..944c196 100644
|
|
Zbigniew Jędrzejewski-Szmek |
d66047 |
--- a/src/core/manager.c
|
|
Zbigniew Jędrzejewski-Szmek |
d66047 |
+++ b/src/core/manager.c
|
|
Zbigniew Jędrzejewski-Szmek |
d66047 |
@@ -1966,6 +1966,9 @@ void manager_send_unit_plymouth(Manager *m, Unit *u) {
|
|
Zbigniew Jędrzejewski-Szmek |
d66047 |
if (m->running_as != SYSTEMD_SYSTEM)
|
|
Zbigniew Jędrzejewski-Szmek |
d66047 |
return;
|
|
Zbigniew Jędrzejewski-Szmek |
d66047 |
|
|
Zbigniew Jędrzejewski-Szmek |
d66047 |
+ if (detect_container(NULL) > 0)
|
|
Zbigniew Jędrzejewski-Szmek |
d66047 |
+ return;
|
|
Zbigniew Jędrzejewski-Szmek |
d66047 |
+
|
|
Zbigniew Jędrzejewski-Szmek |
d66047 |
if (u->type != UNIT_SERVICE &&
|
|
Zbigniew Jędrzejewski-Szmek |
d66047 |
u->type != UNIT_MOUNT &&
|
|
Zbigniew Jędrzejewski-Szmek |
d66047 |
u->type != UNIT_SWAP)
|