From af2d49f70bcff20efaf2d69aecaf4b3e898ff1fa Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 15 Nov 2010 22:12:41 +0100 Subject: drop support for MANAGER_SESSION, introduce MANAGER_USER instead --- units/session/.gitignore | 1 - units/session/Makefile | 1 - units/session/default.target | 11 ----------- units/session/exit.service.in | 18 ------------------ units/session/exit.target | 18 ------------------ units/user/.gitignore | 1 + units/user/Makefile | 1 + units/user/default.target | 11 +++++++++++ units/user/exit.service.in | 18 ++++++++++++++++++ units/user/exit.target | 18 ++++++++++++++++++ 10 files changed, 49 insertions(+), 49 deletions(-) delete mode 100644 units/session/.gitignore delete mode 120000 units/session/Makefile delete mode 100644 units/session/default.target delete mode 100644 units/session/exit.service.in delete mode 100644 units/session/exit.target create mode 100644 units/user/.gitignore create mode 120000 units/user/Makefile create mode 100644 units/user/default.target create mode 100644 units/user/exit.service.in create mode 100644 units/user/exit.target (limited to 'units') diff --git a/units/session/.gitignore b/units/session/.gitignore deleted file mode 100644 index eeb62b32b..000000000 --- a/units/session/.gitignore +++ /dev/null @@ -1 +0,0 @@ -exit.service diff --git a/units/session/Makefile b/units/session/Makefile deleted file mode 120000 index 50be21181..000000000 --- a/units/session/Makefile +++ /dev/null @@ -1 +0,0 @@ -../../src/Makefile \ No newline at end of file diff --git a/units/session/default.target b/units/session/default.target deleted file mode 100644 index deb310c2f..000000000 --- a/units/session/default.target +++ /dev/null @@ -1,11 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. - -# See systemd.special(7) for details - -[Unit] -Description=Default diff --git a/units/session/exit.service.in b/units/session/exit.service.in deleted file mode 100644 index 024fbe172..000000000 --- a/units/session/exit.service.in +++ /dev/null @@ -1,18 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. - -# See systemd.special(7) for details - -[Unit] -Description=Exit the Session -DefaultDependencies=no -Requires=shutdown.target -After=shutdown.target - -[Service] -Type=oneshot -ExecStart=@SYSTEMCTL@ --session --force exit diff --git a/units/session/exit.target b/units/session/exit.target deleted file mode 100644 index f34844c0d..000000000 --- a/units/session/exit.target +++ /dev/null @@ -1,18 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. - -# See systemd.special(7) for details - -[Unit] -Description=Exit the Session -DefaultDependencies=no -Requires=exit.service -After=exit.service -AllowIsolate=yes - -[Install] -Alias=ctrl-alt-del.target diff --git a/units/user/.gitignore b/units/user/.gitignore new file mode 100644 index 000000000..eeb62b32b --- /dev/null +++ b/units/user/.gitignore @@ -0,0 +1 @@ +exit.service diff --git a/units/user/Makefile b/units/user/Makefile new file mode 120000 index 000000000..50be21181 --- /dev/null +++ b/units/user/Makefile @@ -0,0 +1 @@ +../../src/Makefile \ No newline at end of file diff --git a/units/user/default.target b/units/user/default.target new file mode 100644 index 000000000..deb310c2f --- /dev/null +++ b/units/user/default.target @@ -0,0 +1,11 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +# See systemd.special(7) for details + +[Unit] +Description=Default diff --git a/units/user/exit.service.in b/units/user/exit.service.in new file mode 100644 index 000000000..a20b089c9 --- /dev/null +++ b/units/user/exit.service.in @@ -0,0 +1,18 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +# See systemd.special(7) for details + +[Unit] +Description=Exit the Session +DefaultDependencies=no +Requires=shutdown.target +After=shutdown.target + +[Service] +Type=oneshot +ExecStart=@SYSTEMCTL@ --user --force exit diff --git a/units/user/exit.target b/units/user/exit.target new file mode 100644 index 000000000..f34844c0d --- /dev/null +++ b/units/user/exit.target @@ -0,0 +1,18 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +# See systemd.special(7) for details + +[Unit] +Description=Exit the Session +DefaultDependencies=no +Requires=exit.service +After=exit.service +AllowIsolate=yes + +[Install] +Alias=ctrl-alt-del.target -- cgit v1.2.3