diff options
author | Adrian Szyndela <adrian.s@samsung.com> | 2020-03-26 16:27:17 +0100 |
---|---|---|
committer | Adrian Szyndela <adrian.s@samsung.com> | 2020-03-26 16:27:17 +0100 |
commit | a38e2bbf80ed9d3da6f238ee87d2348b61a6e372 (patch) | |
tree | 13b15d6a3f58673b75c99355dda93e1ab8fe6f4b /units/user | |
parent | 33b11b26145b0ab55836cda8b6492a360756febb (diff) | |
parent | de7436b02badc82200dc127ff190b8155769b8e7 (diff) | |
download | systemd-a38e2bbf80ed9d3da6f238ee87d2348b61a6e372.tar.gz systemd-a38e2bbf80ed9d3da6f238ee87d2348b61a6e372.tar.bz2 systemd-a38e2bbf80ed9d3da6f238ee87d2348b61a6e372.zip |
Merge v239 into tizen
systemd 239
Diffstat (limited to 'units/user')
-rw-r--r-- | units/user/meson.build | 15 | ||||
-rw-r--r-- | units/user/systemd-exit.service.in | 2 |
2 files changed, 1 insertions, 16 deletions
diff --git a/units/user/meson.build b/units/user/meson.build index 41d21e8096..649fa7a9ad 100644 --- a/units/user/meson.build +++ b/units/user/meson.build @@ -1,19 +1,4 @@ # SPDX-License-Identifier: LGPL-2.1+ -# -# Copyright 2017 Zbigniew Jędrzejewski-Szmek -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. -# -# systemd is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with systemd; If not, see <http://www.gnu.org/licenses/>. units = [ 'basic.target', diff --git a/units/user/systemd-exit.service.in b/units/user/systemd-exit.service.in index 9ce6f1c2ac..d69273f6b3 100644 --- a/units/user/systemd-exit.service.in +++ b/units/user/systemd-exit.service.in @@ -16,4 +16,4 @@ After=shutdown.target [Service] Type=oneshot -ExecStart=@KILL@ -s 58 $MANAGERPID +ExecStart=@SYSTEMCTL@ --user --force exit |