[systemd-commits] 4 commits - Makefile.am man/systemd-user-sessions.service.xml src/login src/user-sessions
Zbigniew Jędrzejewski-Szmek
zbyszek at kemper.freedesktop.org
Fri Feb 27 14:28:26 PST 2015
Makefile.am | 42 ++++++++++++-----
man/systemd-user-sessions.service.xml | 9 +--
src/login/user-sessions.c | 80 ----------------------------------
src/user-sessions/Makefile | 1
src/user-sessions/user-sessions.c | 80 ++++++++++++++++++++++++++++++++++
5 files changed, 114 insertions(+), 98 deletions(-)
New commits:
commit 6a333238366b3f28124f724ad607a0f00f41a328
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Fri Feb 27 17:26:48 2015 -0500
build-sys: use -Wno-missing-field-initializers for efi stuff
diff --git a/Makefile.am b/Makefile.am
index 751f44c..ee5401d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2541,6 +2541,7 @@ efi_cflags = \
-fno-strict-aliasing \
-fno-stack-protector \
-Wsign-compare \
+ -Wno-missing-field-initializers \
-mno-sse \
-mno-mmx
commit 3849a2ac8198fedd25e66fe780821fa96eb6396d
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Fri Feb 27 17:26:42 2015 -0500
man: correct description of systemd-user-sessions
That part of functionality was removed in 7fb3ee51c1b377.
diff --git a/man/systemd-user-sessions.service.xml b/man/systemd-user-sessions.service.xml
index 9d796b1..e75ef11 100644
--- a/man/systemd-user-sessions.service.xml
+++ b/man/systemd-user-sessions.service.xml
@@ -55,13 +55,12 @@
<title>Description</title>
<para><filename>systemd-user-sessions.service</filename> is a
- service that controls user logins. After basic system
- initialization is complete it removes
+ service that controls user logins through
+ <citerefentry project='man-pages'><refentrytitle>pam_nologin</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
+ After basic system initialization is complete it removes
<filename>/run/nologin</filename>, thus permitting logins. Before
system shutdown it creates <filename>/run/nologin</filename>, thus
- prohibiting further logins. At the same time it also kills all
- user processes, so that system shutdown may proceed without any
- remaining user processes around.</para>
+ prohibiting further logins.</para>
</refsect1>
<refsect1>
commit 83e7d8850c38baee0da3097f27e191359aa70006
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Fri Feb 27 17:26:26 2015 -0500
build-sys: make systemd-user-sessions conditional on PAM again
This undoes a part of previous commit: s-u-s is dependent on HAVE_PAM
again, but not on HAVE_LOGIND.
diff --git a/Makefile.am b/Makefile.am
index 5847bb4..751f44c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -393,8 +393,7 @@ rootlibexec_PROGRAMS = \
systemd-sleep \
systemd-bus-proxyd \
systemd-socket-proxyd \
- systemd-update-done \
- systemd-user-sessions
+ systemd-update-done
if HAVE_UTMP
rootlibexec_PROGRAMS += \
@@ -555,8 +554,7 @@ nodist_systemunit_DATA = \
units/initrd-udevadm-cleanup-db.service \
units/initrd-switch-root.service \
units/systemd-nspawn at .service \
- units/systemd-update-done.service \
- units/systemd-user-sessions.service
+ units/systemd-update-done.service
if HAVE_UTMP
nodist_systemunit_DATA += \
@@ -609,8 +607,7 @@ EXTRA_DIST += \
units/initrd-udevadm-cleanup-db.service.in \
units/initrd-switch-root.service.in \
units/systemd-nspawn at .service.in \
- units/systemd-update-done.service.in \
- units/systemd-user-sessions.service.in
+ units/systemd-update-done.service.in
CLEANFILES += \
units/console-shell.service.m4 \
@@ -2126,13 +2123,6 @@ systemd_update_done_LDADD = \
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
@@ -6015,6 +6005,7 @@ pamlib_LTLIBRARIES = \
dist_pamconf_DATA = \
src/login/systemd-user
+
endif
nodist_systemunit_DATA += \
@@ -6074,6 +6065,30 @@ EXTRA_DIST += \
units/systemd-logind.service.in
# ------------------------------------------------------------------------------
+if HAVE_PAM
+
+systemd_user_sessions_SOURCES = \
+ src/user-sessions/user-sessions.c
+
+systemd_user_sessions_LDADD = \
+ libsystemd-shared.la
+
+rootlibexec_PROGRAMS += \
+ systemd-user-sessions
+
+nodist_systemunit_DATA += \
+ units/systemd-user-sessions.service
+
+EXTRA_DIST += \
+ units/systemd-user-sessions.service.in
+
+MULTI_USER_TARGET_WANTS += \
+ systemd-user-sessions.service
+
+endif
+
+# ------------------------------------------------------------------------------
+
if HAVE_PYTHON_DEVEL
pkgpyexec_LTLIBRARIES = \
_journal.la \
@@ -6596,8 +6611,7 @@ LOCAL_FS_TARGET_WANTS += \
MULTI_USER_TARGET_WANTS += \
getty.target \
- systemd-ask-password-wall.path \
- systemd-user-sessions.service
+ systemd-ask-password-wall.path
SYSINIT_TARGET_WANTS += \
dev-hugepages.mount \
diff --git a/man/systemd-user-sessions.service.xml b/man/systemd-user-sessions.service.xml
index 9a228df..9d796b1 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 <http://www.gnu.org/licenses/>.
-->
-<refentry id="systemd-user-sessions.service">
+<refentry id="systemd-user-sessions.service" conditional='HAVE_PAM'>
<refentryinfo>
<title>systemd-user-sessions.service</title>
commit ea24d8d1383e038d6b6e599d42c0114b3dbd8acb
Author: Ivan Shapovalov <intelfx100 at gmail.com>
Date: Wed Feb 25 21:47:26 2015 +0300
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.]
diff --git a/Makefile.am b/Makefile.am
index e77a242..5847bb4 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 at .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 at .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 \
@@ -2123,6 +2126,13 @@ systemd_update_done_LDADD = \
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 9d796b1..9a228df 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 <http://www.gnu.org/licenses/>.
-->
-<refentry id="systemd-user-sessions.service" conditional='HAVE_PAM'>
+<refentry id="systemd-user-sessions.service">
<refentryinfo>
<title>systemd-user-sessions.service</title>
diff --git a/src/login/user-sessions.c b/src/login/user-sessions.c
deleted file mode 100644
index 1c31769..0000000
--- 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 <http://www.gnu.org/licenses/>.
-***/
-
-#include <unistd.h>
-#include <errno.h>
-
-#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 0000000..d0b0e8e
--- /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 0000000..1c31769
--- /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 <http://www.gnu.org/licenses/>.
+***/
+
+#include <unistd.h>
+#include <errno.h>
+
+#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;
+}
More information about the systemd-commits
mailing list