|
 |
17aa40 |
From b0394ad25fd601b9ef29d26b87f12b0a0c17cda0 Mon Sep 17 00:00:00 2001
|
|
|
17aa40 |
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
|
17aa40 |
Date: Tue, 16 Oct 2018 15:09:11 +0200
|
|
|
17aa40 |
Subject: [PATCH] units: use SuccessAction=exit-force in systemd-exit.service
|
|
|
17aa40 |
|
|
|
17aa40 |
Fixes #10414.
|
|
|
17aa40 |
|
|
|
17aa40 |
v2:
|
|
|
17aa40 |
- rename .service.in to .service
|
|
|
17aa40 |
- rename 'exit' to 'exit-force'
|
|
|
17aa40 |
|
|
|
17aa40 |
(cherry picked from commit 631c9b7bf2dab5065d753a7b1cfaff5b100b3c90)
|
|
|
17aa40 |
|
|
|
17aa40 |
Resolves: #1860899
|
|
|
17aa40 |
---
|
|
|
17aa40 |
units/user/meson.build | 2 +-
|
|
|
17aa40 |
units/user/{systemd-exit.service.in => systemd-exit.service} | 5 +----
|
|
|
17aa40 |
2 files changed, 2 insertions(+), 5 deletions(-)
|
|
|
17aa40 |
rename units/user/{systemd-exit.service.in => systemd-exit.service} (87%)
|
|
|
17aa40 |
|
|
|
17aa40 |
diff --git a/units/user/meson.build b/units/user/meson.build
|
|
|
17aa40 |
index b1c2e95597..36341a42f5 100644
|
|
|
17aa40 |
--- a/units/user/meson.build
|
|
|
17aa40 |
+++ b/units/user/meson.build
|
|
|
17aa40 |
@@ -14,6 +14,7 @@ units = [
|
|
|
17aa40 |
'sockets.target',
|
|
|
17aa40 |
'sound.target',
|
|
|
17aa40 |
'timers.target',
|
|
|
17aa40 |
+ 'systemd-exit.service',
|
|
|
17aa40 |
'systemd-tmpfiles-clean.timer',
|
|
|
17aa40 |
]
|
|
|
17aa40 |
|
|
|
17aa40 |
@@ -23,7 +24,6 @@ foreach file : units
|
|
|
17aa40 |
endforeach
|
|
|
17aa40 |
|
|
|
17aa40 |
in_units = [
|
|
|
17aa40 |
- 'systemd-exit.service',
|
|
|
17aa40 |
'systemd-tmpfiles-clean.service',
|
|
|
17aa40 |
'systemd-tmpfiles-setup.service',
|
|
|
17aa40 |
]
|
|
|
17aa40 |
diff --git a/units/user/systemd-exit.service.in b/units/user/systemd-exit.service
|
|
|
17aa40 |
similarity index 87%
|
|
|
17aa40 |
rename from units/user/systemd-exit.service.in
|
|
|
17aa40 |
rename to units/user/systemd-exit.service
|
|
|
17aa40 |
index d69273f6b3..1d3b61e3ab 100644
|
|
|
17aa40 |
--- a/units/user/systemd-exit.service.in
|
|
|
17aa40 |
+++ b/units/user/systemd-exit.service
|
|
|
17aa40 |
@@ -13,7 +13,4 @@ Documentation=man:systemd.special(7)
|
|
|
17aa40 |
DefaultDependencies=no
|
|
|
17aa40 |
Requires=shutdown.target
|
|
|
17aa40 |
After=shutdown.target
|
|
|
17aa40 |
-
|
|
|
17aa40 |
-[Service]
|
|
|
17aa40 |
-Type=oneshot
|
|
|
17aa40 |
-ExecStart=@SYSTEMCTL@ --user --force exit
|
|
|
17aa40 |
+SuccessAction=exit-force
|