summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-01-28 21:18:31 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-01-31 01:34:40 -0500
commitb3ad0ff48c154ed056a6bded2adac609395a9439 (patch)
tree5062c3990f2ee1c15a2e90728266ffffc3b2ac9c /src
parent3ab2feefd7d1918e8f0d0edaea46a87cbed0f211 (diff)
systemctl: always avoid being killed when doing switch-root
The same logic as described in acc28e2e3037d689d6481e applies to any time we are switching root, to just set the flag unconditionally.
Diffstat (limited to 'src')
-rw-r--r--src/systemctl/systemctl.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 41e8d6075a..6eed921ecf 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -5655,11 +5655,9 @@ static int switch_root(int argc, char *argv[], void *userdata) {
}
/* Instruct PID1 to exclude us from its killing spree applied during
- * the transition from the initrd to the main system otherwise we would
- * exit with a failure status even though the switch to the new root
- * has succeed. */
- if (in_initrd())
- argv_cmdline[0] = '@';
+ * the transition. Otherwise we would exit with a failure status even
+ * though the switch to the new root has succeed. */
+ argv_cmdline[0] = '@';
r = acquire_bus(BUS_MANAGER, &bus);
if (r < 0)