From 1795457f50f8d67c6a7d1d08cad401d88b82eda4 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 16 Nov 2018 11:34:47 +0100 Subject: [PATCH 1/3] units: add the same ordering deps for systemd-exit.service as for systemd-poweroff.service and friends This stuff runs in containers, and should really behave the same everywhere. --- units/systemd-exit.service | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/units/systemd-exit.service b/units/systemd-exit.service index 6029b13a052..356b131d053 100644 --- a/units/systemd-exit.service +++ b/units/systemd-exit.service @@ -11,6 +11,6 @@ Description=Exit the Session Documentation=man:systemd.special(7) DefaultDependencies=no -Requires=shutdown.target -After=shutdown.target +Requires=shutdown.target umount.target final.target +After=shutdown.target umount.target final.target SuccessAction=exit From 9f782b3e1b9eb9645e9b5bfcf9a33da12e91337a Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 16 Nov 2018 11:35:59 +0100 Subject: [PATCH 2/3] units: use correct command to exit Otherwise we'll end a cyclic loop. --- units/systemd-exit.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/units/systemd-exit.service b/units/systemd-exit.service index 356b131d053..e5b270fc361 100644 --- a/units/systemd-exit.service +++ b/units/systemd-exit.service @@ -13,4 +13,4 @@ Documentation=man:systemd.special(7) DefaultDependencies=no Requires=shutdown.target umount.target final.target After=shutdown.target umount.target final.target -SuccessAction=exit +SuccessAction=exit-force From 3f547ca5a6712f9bb5ca96c981986df0d8a7e582 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 16 Nov 2018 11:39:27 +0100 Subject: [PATCH 3/3] units: fix Description= of systemd-exit.service This file was probably copied from the --user version, let's use some more appropriate wording for the --system version. --- units/systemd-exit.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/units/systemd-exit.service b/units/systemd-exit.service index e5b270fc361..773c400b476 100644 --- a/units/systemd-exit.service +++ b/units/systemd-exit.service @@ -8,7 +8,7 @@ # (at your option) any later version. [Unit] -Description=Exit the Session +Description=Exit the Container Documentation=man:systemd.special(7) DefaultDependencies=no Requires=shutdown.target umount.target final.target