From: Ivan Shapovalov <intelfx100@gmail.com>
Date: Wed, 25 Feb 2015 18:47:26 +0000 (+0300)
Subject: user-sessions: move into own subdir and build independently of logind
X-Git-Tag: v219.0~547
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=ea24d8d1383e038d6b6e599d42c0114b3dbd8acb;hp=8a9c6071cb7467170010f0287672c987981bdf9c

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 e77a2427c..5847bb4ae 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 9d796b1ae..9a228dfe9 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/user-sessions/Makefile b/src/user-sessions/Makefile
new file mode 120000
index 000000000..d0b0e8e00
--- /dev/null
+++ b/src/user-sessions/Makefile
@@ -0,0 +1 @@
+../Makefile
\ No newline at end of file
diff --git a/src/login/user-sessions.c b/src/user-sessions/user-sessions.c
similarity index 100%
rename from src/login/user-sessions.c
rename to src/user-sessions/user-sessions.c