systemd-user-sessions: install .service file and enable by default

diff --git a/Makefile.am b/Makefile.am
index 7d0ca9a954fd8fb98040d7496599748c56306908..13c6ffa4dbfcc409c21eab36cede339eef18aaf1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -228,6 +228,7 @@ nodist_systemunit_DATA = \
        units/systemd-readahead-replay.service \
        units/systemd-readahead-done.service \
        units/systemd-tmpfiles.service \
        units/systemd-readahead-replay.service \
        units/systemd-readahead-done.service \
        units/systemd-tmpfiles.service \

+       units/systemd-user-sessions.service \

        units/syslog.target
 
 dist_sessionunit_DATA = \
        units/syslog.target
 
 dist_sessionunit_DATA = \


@@ -259,6 +260,7 @@ EXTRA_DIST = \
        units/systemd-readahead-replay.service.in \
        units/systemd-readahead-done.service.in \
        units/systemd-tmpfiles.service.in \
        units/systemd-readahead-replay.service.in \
        units/systemd-readahead-done.service.in \
        units/systemd-tmpfiles.service.in \

+       units/systemd-user-sessions.service.in \

        units/syslog.target.in \
        units/session/exit.service.in \
        systemd.pc.in
        units/syslog.target.in \
        units/session/exit.service.in \
        systemd.pc.in


@@ -1072,8 +1074,9 @@ install-data-hook:
                $(LN_S) graphical.target default.target && \
                $(LN_S) reboot.target ctrl-alt-del.target )
        ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
                $(LN_S) graphical.target default.target && \
                $(LN_S) reboot.target ctrl-alt-del.target )
        ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \

-               rm -f getty.target && \
-               $(LN_S) ../getty.target getty.target )
+               rm -f getty.target systemd-user-sessions.service && \
+               $(LN_S) ../getty.target getty.target && \
+               $(LN_S) ../systemd-user-sessions.service systemd-user-sessions.service )

        ( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
                rm -f getty@tty1.service getty@tty2.service getty@tty3.service getty@tty4.service getty@tty5.service getty@tty6.service && \
                $(LN_S) $(systemunitdir)/getty@.service getty@tty1.service && \
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
                rm -f getty@tty1.service getty@tty2.service getty@tty3.service getty@tty4.service getty@tty5.service getty@tty6.service && \
                $(LN_S) $(systemunitdir)/getty@.service getty@tty1.service && \

diff --git a/units/.gitignore b/units/.gitignore
index f5a42dd53e31deaf7ef30d62ff0772dd688fc9ec..00a40d4e9cc814acb184342340b24726e3d14847 100644 (file)
--- a/units/.gitignore
+++ b/units/.gitignore
@@ -1,3 +1,4 @@
+systemd-user-sessions.service

 systemd-readahead-done.service
 systemd-tmpfiles.service
 systemd-readahead-collect.service
 systemd-readahead-done.service
 systemd-tmpfiles.service
 systemd-readahead-collect.service

diff --git a/units/systemd-user-sessions.service.in b/units/systemd-user-sessions.service.in
new file mode 100644 (file)
index 0000000..a93d586
--- /dev/null
+++ b/units/systemd-user-sessions.service.in
@@ -0,0 +1,16 @@
+#  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.
+
+[Unit]
+Description=Permit User Sessions
+After=local-fs.target remote-fs.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=@rootlibexecdir@/systemd-user-sessions start
+ExecStop=@rootlibexecdir@/systemd-user-sessions stop