From ea24d8d1383e038d6b6e599d42c0114b3dbd8acb Mon Sep 17 00:00:00 2001 From: Ivan Shapovalov Date: Wed, 25 Feb 2015 21:47:26 +0300 Subject: user-sessions: move into own subdir and build independently of logind Suggested by Zbyszek on IRC. [zj: /run/nologin is used with PAM. systemd-user-session is independent of logind.] --- Makefile.am | 37 ++++++++-------- man/systemd-user-sessions.service.xml | 2 +- src/login/user-sessions.c | 80 ----------------------------------- src/user-sessions/Makefile | 1 + src/user-sessions/user-sessions.c | 80 +++++++++++++++++++++++++++++++++++ 5 files changed, 101 insertions(+), 99 deletions(-) delete mode 100644 src/login/user-sessions.c create mode 120000 src/user-sessions/Makefile create mode 100644 src/user-sessions/user-sessions.c diff --git a/Makefile.am b/Makefile.am index e77a2427c6..5847bb4ae4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -393,7 +393,8 @@ rootlibexec_PROGRAMS = \ systemd-sleep \ systemd-bus-proxyd \ systemd-socket-proxyd \ - systemd-update-done + systemd-update-done \ + systemd-user-sessions if HAVE_UTMP rootlibexec_PROGRAMS += \ @@ -554,7 +555,8 @@ nodist_systemunit_DATA = \ units/initrd-udevadm-cleanup-db.service \ units/initrd-switch-root.service \ units/systemd-nspawn@.service \ - units/systemd-update-done.service + units/systemd-update-done.service \ + units/systemd-user-sessions.service if HAVE_UTMP nodist_systemunit_DATA += \ @@ -607,7 +609,8 @@ EXTRA_DIST += \ units/initrd-udevadm-cleanup-db.service.in \ units/initrd-switch-root.service.in \ units/systemd-nspawn@.service.in \ - units/systemd-update-done.service.in + units/systemd-update-done.service.in \ + units/systemd-user-sessions.service.in CLEANFILES += \ units/console-shell.service.m4 \ @@ -2122,6 +2125,13 @@ systemd_update_done_LDADD = \ libsystemd-label.la \ libsystemd-shared.la +# ------------------------------------------------------------------------------ +systemd_user_sessions_SOURCES = \ + src/user-sessions/user-sessions.c + +systemd_user_sessions_LDADD = \ + libsystemd-shared.la + # ------------------------------------------------------------------------------ systemd_shutdownd_SOURCES = \ src/shutdownd/shutdownd.c @@ -5907,15 +5917,8 @@ endif noinst_LTLIBRARIES += \ libsystemd-logind-core.la -systemd_user_sessions_SOURCES = \ - src/login/user-sessions.c - -systemd_user_sessions_LDADD = \ - libsystemd-shared.la - rootlibexec_PROGRAMS += \ - systemd-logind \ - systemd-user-sessions + systemd-logind loginctl_SOURCES = \ src/login/loginctl.c \ @@ -6015,8 +6018,7 @@ dist_pamconf_DATA = \ endif nodist_systemunit_DATA += \ - units/systemd-logind.service \ - units/systemd-user-sessions.service + units/systemd-logind.service dist_systemunit_DATA += \ units/user.slice @@ -6040,8 +6042,7 @@ INSTALL_DIRS += \ $(systemdstatedir) MULTI_USER_TARGET_WANTS += \ - systemd-logind.service \ - systemd-user-sessions.service + systemd-logind.service SYSTEM_UNIT_ALIASES += \ systemd-logind.service dbus-org.freedesktop.login1.service @@ -6070,8 +6071,7 @@ EXTRA_DIST += \ src/login/logind-gperf.gperf \ src/login/71-seat.rules.in \ src/login/73-seat-late.rules.in \ - units/systemd-logind.service.in \ - units/systemd-user-sessions.service.in + units/systemd-logind.service.in # ------------------------------------------------------------------------------ if HAVE_PYTHON_DEVEL @@ -6596,7 +6596,8 @@ LOCAL_FS_TARGET_WANTS += \ MULTI_USER_TARGET_WANTS += \ getty.target \ - systemd-ask-password-wall.path + systemd-ask-password-wall.path \ + systemd-user-sessions.service SYSINIT_TARGET_WANTS += \ dev-hugepages.mount \ diff --git a/man/systemd-user-sessions.service.xml b/man/systemd-user-sessions.service.xml index 9d796b1ae1..9a228dfe9f 100644 --- a/man/systemd-user-sessions.service.xml +++ b/man/systemd-user-sessions.service.xml @@ -19,7 +19,7 @@ You should have received a copy of the GNU Lesser General Public License along with systemd; If not, see . --> - + systemd-user-sessions.service diff --git a/src/login/user-sessions.c b/src/login/user-sessions.c deleted file mode 100644 index 1c31769fde..0000000000 --- a/src/login/user-sessions.c +++ /dev/null @@ -1,80 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -/*** - This file is part of systemd. - - Copyright 2010 Lennart Poettering - - 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 . -***/ - -#include -#include - -#include "log.h" -#include "util.h" -#include "fileio.h" - -int main(int argc, char*argv[]) { - - if (argc != 2) { - log_error("This program requires one argument."); - return EXIT_FAILURE; - } - - log_set_target(LOG_TARGET_AUTO); - log_parse_environment(); - log_open(); - - umask(0022); - - if (streq(argv[1], "start")) { - int r = 0; - - if (unlink("/run/nologin") < 0 && errno != ENOENT) { - log_error_errno(errno, "Failed to remove /run/nologin file: %m"); - r = -errno; - } - - if (unlink("/etc/nologin") < 0 && errno != ENOENT) { - /* If the file doesn't exist and /etc simply - * was read-only (in which case unlink() - * returns EROFS even if the file doesn't - * exist), don't complain */ - - if (errno != EROFS || access("/etc/nologin", F_OK) >= 0) { - log_error_errno(errno, "Failed to remove /etc/nologin file: %m"); - return EXIT_FAILURE; - } - } - - if (r < 0) - return EXIT_FAILURE; - - } else if (streq(argv[1], "stop")) { - int r; - - r = write_string_file_atomic("/run/nologin", "System is going down."); - if (r < 0) { - log_error_errno(r, "Failed to create /run/nologin: %m"); - return EXIT_FAILURE; - } - - } else { - log_error("Unknown verb %s.", argv[1]); - return EXIT_FAILURE; - } - - return EXIT_SUCCESS; -} diff --git a/src/user-sessions/Makefile b/src/user-sessions/Makefile new file mode 120000 index 0000000000..d0b0e8e008 --- /dev/null +++ b/src/user-sessions/Makefile @@ -0,0 +1 @@ +../Makefile \ No newline at end of file diff --git a/src/user-sessions/user-sessions.c b/src/user-sessions/user-sessions.c new file mode 100644 index 0000000000..1c31769fde --- /dev/null +++ b/src/user-sessions/user-sessions.c @@ -0,0 +1,80 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +/*** + This file is part of systemd. + + Copyright 2010 Lennart Poettering + + 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 . +***/ + +#include +#include + +#include "log.h" +#include "util.h" +#include "fileio.h" + +int main(int argc, char*argv[]) { + + if (argc != 2) { + log_error("This program requires one argument."); + return EXIT_FAILURE; + } + + log_set_target(LOG_TARGET_AUTO); + log_parse_environment(); + log_open(); + + umask(0022); + + if (streq(argv[1], "start")) { + int r = 0; + + if (unlink("/run/nologin") < 0 && errno != ENOENT) { + log_error_errno(errno, "Failed to remove /run/nologin file: %m"); + r = -errno; + } + + if (unlink("/etc/nologin") < 0 && errno != ENOENT) { + /* If the file doesn't exist and /etc simply + * was read-only (in which case unlink() + * returns EROFS even if the file doesn't + * exist), don't complain */ + + if (errno != EROFS || access("/etc/nologin", F_OK) >= 0) { + log_error_errno(errno, "Failed to remove /etc/nologin file: %m"); + return EXIT_FAILURE; + } + } + + if (r < 0) + return EXIT_FAILURE; + + } else if (streq(argv[1], "stop")) { + int r; + + r = write_string_file_atomic("/run/nologin", "System is going down."); + if (r < 0) { + log_error_errno(r, "Failed to create /run/nologin: %m"); + return EXIT_FAILURE; + } + + } else { + log_error("Unknown verb %s.", argv[1]); + return EXIT_FAILURE; + } + + return EXIT_SUCCESS; +} -- cgit v1.2.3-54-g00ecf