summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2020-03-06 21:14:36 +0900
committerGitHub <noreply@github.com>2020-03-06 21:14:36 +0900
commit5197b41fac92fa7a57cc59b206bd93e3d1662b94 (patch)
treed65e0f2f230426f0491cdaa7ad7d181199d4ab37
parent9cbf1e58f9629af5c6b56777ee73dc6320306d6d (diff)
parentd48eea583fd8ddb429728d110dfc826d70d70bd1 (diff)
downloadsystemd-5197b41fac92fa7a57cc59b206bd93e3d1662b94.tar.gz
Merge pull request #15022 from keszybz/make-units-remain-after-exit
Make units remain after exit
-rw-r--r--src/core/execute.c3
-rw-r--r--units/systemd-network-generator.service.in1
-rw-r--r--units/systemd-vconsole-setup.service.in1
3 files changed, 3 insertions, 2 deletions
diff --git a/src/core/execute.c b/src/core/execute.c
index 4595bb12dc..89dbf6fbd2 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -3406,8 +3406,7 @@ static int exec_child(
our_env,
pass_env,
context->environment,
- files_env,
- NULL);
+ files_env);
if (!accum_env) {
*exit_status = EXIT_MEMORY;
return log_oom();
diff --git a/units/systemd-network-generator.service.in b/units/systemd-network-generator.service.in
index 1a70ad70e9..070d87e154 100644
--- a/units/systemd-network-generator.service.in
+++ b/units/systemd-network-generator.service.in
@@ -15,6 +15,7 @@ Before=network-pre.target
[Service]
Type=oneshot
+RemainAfterExit=yes
ExecStart=@rootlibexecdir@/systemd-network-generator
[Install]
diff --git a/units/systemd-vconsole-setup.service.in b/units/systemd-vconsole-setup.service.in
index f4178f495a..9042521c9d 100644
--- a/units/systemd-vconsole-setup.service.in
+++ b/units/systemd-vconsole-setup.service.in
@@ -16,4 +16,5 @@ ConditionPathExists=/dev/tty0
[Service]
Type=oneshot
+RemainAfterExit=yes
ExecStart=@rootlibexecdir@/systemd-vconsole-setup