X Tutup
Skip to content

Commit af2d49f

Browse files
poetteringpoettering
committed
drop support for MANAGER_SESSION, introduce MANAGER_USER instead
1 parent 62347bc commit af2d49f

26 files changed

+160
-142
lines changed

‎Makefile.am‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ bashcompletiondir=$(sysconfdir)/bash_completion.d
3030

3131
# Our own, non-special dirs
3232
pkgsysconfdir=$(sysconfdir)/systemd
33-
sessionunitdir=$(pkgdatadir)/session
33+
userunitdir=$(pkgdatadir)/user
3434
tmpfilesdir=$(sysconfdir)/tmpfiles.d
35-
sessiongeneratordir=$(pkglibexecdir)/session-generators
35+
usergeneratordir=$(pkglibexecdir)/user-generators
3636

3737
# And these are the special ones for /
3838
rootdir=@rootdir@
@@ -49,9 +49,9 @@ AM_CPPFLAGS = \
4949
-DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
5050
-DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" \
5151
-DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
52-
-DSESSION_CONFIG_FILE=\"$(pkgsysconfdir)/session.conf\" \
53-
-DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \
54-
-DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
52+
-DUSER_CONFIG_FILE=\"$(pkgsysconfdir)/user.conf\" \
53+
-DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \
54+
-DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \
5555
-DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
5656
-DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \
5757
-DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
@@ -61,7 +61,7 @@ AM_CPPFLAGS = \
6161
-DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
6262
-DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
6363
-DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
64-
-DSESSION_GENERATOR_PATH=\"$(sessiongeneratordir)\" \
64+
-DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
6565
-I $(top_srcdir)/src
6666

6767
if TARGET_GENTOO
@@ -268,13 +268,13 @@ nodist_systemunit_DATA = \
268268
units/quotacheck.service \
269269
units/rescue.service
270270

271-
dist_sessionunit_DATA = \
272-
units/session/default.target \
273-
units/session/exit.target
271+
dist_userunit_DATA = \
272+
units/user/default.target \
273+
units/user/exit.target
274274

275-
nodist_sessionunit_DATA = \
276-
units/session/remote-fs.target \
277-
units/session/exit.service
275+
nodist_userunit_DATA = \
276+
units/user/remote-fs.target \
277+
units/user/exit.service
278278

279279
EXTRA_DIST = \
280280
units/getty@.service.m4 \
@@ -307,7 +307,7 @@ EXTRA_DIST = \
307307
units/poweroff.service.in \
308308
units/reboot.service.in \
309309
units/kexec.service.in \
310-
units/session/exit.service.in \
310+
units/user/exit.service.in \
311311
units/fsck@.service.in \
312312
units/fsck-root.service.in \
313313
units/quotacheck.service.in \
@@ -1008,19 +1008,19 @@ M4_PROCESS_SYSTEM = \
10081008
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
10091009
$(M4) -P $(M4_DISTRO_FLAG) -DFOR_SYSTEM=1 < $< > $@ || rm $@
10101010

1011-
M4_PROCESS_SESSION = \
1011+
M4_PROCESS_USER = \
10121012
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
1013-
$(M4) -P $(M4_DISTRO_FLAG) -DFOR_SESSION=1 < $< > $@ || rm $@
1013+
$(M4) -P $(M4_DISTRO_FLAG) -DFOR_USER=1 < $< > $@ || rm $@
10141014

10151015
units/%: units/%.m4 Makefile
10161016
$(M4_PROCESS_SYSTEM)
10171017

1018-
units/session/%: units/%.m4 Makefile
1019-
$(M4_PROCESS_SESSION)
1018+
units/user/%: units/%.m4 Makefile
1019+
$(M4_PROCESS_USER)
10201020

10211021
CLEANFILES = \
10221022
$(nodist_systemunit_DATA) \
1023-
$(nodist_sessionunit_DATA) \
1023+
$(nodist_userunit_DATA) \
10241024
$(nodist_man_MANS) \
10251025
${XML_IN_FILES:.xml.in=.html} \
10261026
$(pkgconfigdata_DATA)
@@ -1105,7 +1105,7 @@ CLEANFILES += \
11051105
install-data-hook:
11061106
$(MKDIR_P) -m 0755 \
11071107
$(DESTDIR)$(systemunitdir) \
1108-
$(DESTDIR)$(sessionunitdir) \
1108+
$(DESTDIR)$(userunitdir) \
11091109
$(DESTDIR)$(systemunitdir)/sysinit.target.wants \
11101110
$(DESTDIR)$(systemunitdir)/sockets.target.wants \
11111111
$(DESTDIR)$(systemunitdir)/basic.target.wants \
@@ -1123,11 +1123,11 @@ install-data-hook:
11231123
$(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants \
11241124
$(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \
11251125
$(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \
1126-
$(DESTDIR)$(pkgsysconfdir)/session \
1126+
$(DESTDIR)$(pkgsysconfdir)/user \
11271127
$(DESTDIR)$(sysconfdir)/xdg/systemd
11281128
( cd $(DESTDIR)$(sysconfdir)/xdg/systemd/ && \
1129-
rm -f session && \
1130-
$(LN_S) $(pkgsysconfdir)/session session )
1129+
rm -f user && \
1130+
$(LN_S) $(pkgsysconfdir)/user user )
11311131
( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
11321132
rm -f systemd-initctl.socket systemd-logger.socket systemd-shutdownd.socket syslog.socket && \
11331133
$(LN_S) ../systemd-logger.socket systemd-logger.socket && \
@@ -1167,7 +1167,7 @@ install-data-hook:
11671167
$(LN_S) ../remount-rootfs.service remount-rootfs.service && \
11681168
$(LN_S) ../var-run.mount var-run.mount && \
11691169
$(LN_S) ../var-lock.mount var-lock.mount )
1170-
( cd $(DESTDIR)$(sessionunitdir) && \
1170+
( cd $(DESTDIR)$(userunitdir) && \
11711171
rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target && \
11721172
$(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
11731173
$(LN_S) $(systemunitdir)/sockets.target sockets.target && \

‎TODO‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@
4242

4343
* add systemctl switch to dump transaction without executing it
4444

45-
* system.conf/session.conf man page
46-
4745
* suspend, resume
4846

4947
* systemctl auto-pager a la git
@@ -79,8 +77,6 @@
7977

8078
* declare /etc/os-release cross-distro standard
8179

82-
* rename s/session/user/g
83-
8480
* fix hotplug transactions
8581

8682
External:

‎man/daemon.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -760,8 +760,8 @@
760760
--variable=systemdsystemunitdir</command> (for
761761
system services), resp. <command>pkg-config
762762
systemd
763-
--variable=systemdsessionunitdir</command>
764-
(for session services). This will make the
763+
--variable=systemduserunitdir</command>
764+
(for user services). This will make the
765765
services available in the system on explicit
766766
request but not activate them automatically
767767
during boot. Optionally, during package
@@ -795,7 +795,7 @@ AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_sy
795795
machines, and optionally allows their
796796
installation even on machines lacking
797797
systemd. (Modification of this snippet for the
798-
session unit directory is left as excercise to the
798+
user unit directory is left as excercise to the
799799
reader.)</para>
800800

801801
<para>Additionally, to ensure that

‎man/systemadm.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<refnamediv>
4646
<refname>systemadm</refname>
4747
<refpurpose>Graphical frontend for the systemd system
48-
and session manager</refpurpose>
48+
and service manager</refpurpose>
4949
</refnamediv>
5050

5151
<refsynopsisdiv>
@@ -58,7 +58,7 @@
5858
<title>Description</title>
5959

6060
<para><command>systemadm</command> is a graphical
61-
frontend for the systemd system and session manager
61+
frontend for the systemd system and service manager
6262
and allows introspection and control of
6363
systemd.</para>
6464
</refsect1>
@@ -87,10 +87,10 @@
8787
</varlistentry>
8888

8989
<varlistentry>
90-
<term><option>--session</option></term>
90+
<term><option>--user</option></term>
9191

9292
<listitem><para>Connect to the systemd
93-
session manager of the calling
93+
manager of the calling
9494
user.</para></listitem>
9595
</varlistentry>
9696

‎man/systemctl.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
<refnamediv>
4646
<refname>systemctl</refname>
47-
<refpurpose>Control the systemd system and session manager</refpurpose>
47+
<refpurpose>Control the systemd system and service manager</refpurpose>
4848
</refnamediv>
4949

5050
<refsynopsisdiv>
@@ -59,7 +59,7 @@
5959
<para><command>systemctl</command> may be used to
6060
introspect and control the state of the
6161
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
62-
system and session manager.</para>
62+
system and service manager.</para>
6363
</refsect1>
6464

6565
<refsect1>
@@ -178,10 +178,10 @@
178178
</varlistentry>
179179

180180
<varlistentry>
181-
<term><option>--session</option></term>
181+
<term><option>--user</option></term>
182182

183183
<listitem><para>Talk to the systemd
184-
session manager of the calling user.</para></listitem>
184+
manager of the calling user.</para></listitem>
185185
</varlistentry>
186186

187187
<varlistentry>
@@ -224,10 +224,10 @@
224224
<listitem><para>When used with
225225
<command>enable</command> and
226226
<command>disable</command>, operate on the
227-
global session configuŕation
227+
global user configuŕation
228228
directory, thus enabling or disabling
229229
a unit file globally for all future
230-
sessions of all users.</para></listitem>
230+
logins of all users.</para></listitem>
231231
</varlistentry>
232232

233233
<varlistentry>
@@ -598,11 +598,11 @@
598598

599599
<para>Depending on whether
600600
<option>--system</option>,
601-
<option>--session</option> or
601+
<option>--user</option> or
602602
<option>--global</option> is specified
603603
this enables the unit for the system,
604-
for sessions of the calling user only
605-
or for all future session of all
604+
for the calling user only
605+
or for all future logins of all
606606
users. Note that in the latter case no
607607
systemd daemon configuration is
608608
reloaded.</para>
@@ -643,7 +643,7 @@
643643

644644
<para>This command honours
645645
<option>--system</option>,
646-
<option>--session</option>,
646+
<option>--user</option>,
647647
<option>--global</option> in a similar
648648
way as
649649
<command>enable</command>.</para>
@@ -942,9 +942,9 @@
942942

943943
<listitem><para>Ask the systemd
944944
manager to quit. This is only
945-
supported for session managers
945+
supported for user service managers
946946
(i.e. in conjunction with the
947-
<option>--session</option> option) and
947+
<option>--user</option> option) and
948948
will fail otherwise.</para></listitem>
949949
</varlistentry>
950950
</variablelist>

‎man/systemd.conf.xml‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@
4949

5050
<refsynopsisdiv>
5151
<para><filename>system.conf</filename></para>
52-
<para><filename>session.conf</filename></para>
52+
<para><filename>user.conf</filename></para>
5353
</refsynopsisdiv>
5454

5555
<refsect1>
5656
<title>Description</title>
5757

5858
<para>When run as system instance systemd reads the
5959
configuration file <filename>system.conf</filename>,
60-
otherwise <filename>session.conf</filename>. These
60+
otherwise <filename>user.conf</filename>. These
6161
configuration files contain a few settings controlling
6262
basic manager operations.</para>
6363

@@ -79,6 +79,7 @@
7979
<term><varname>DumpCore=yes</varname></term>
8080
<term><varname>CrashShell=no</varname></term>
8181
<term><varname>ShowStatus=yes</varname></term>
82+
<term><varname>SysVConsole=yes</varname></term>
8283
<term><varname>CrashChVT=1</varname></term>
8384

8485
<listitem><para>Configures various
@@ -99,6 +100,18 @@
99100
process. Takes a space-separated list
100101
of CPU indexes.</para></listitem>
101102
</varlistentry>
103+
104+
<varlistentry>
105+
<term><varname>MountAuto=yes</varname></term>
106+
<term><varname>SwapAuto=yes</varname></term>
107+
108+
<listitem><para>Configures whether
109+
systemd should automatically activate
110+
all swap or mounts listed in
111+
<filename>/etc/fstab</filename>, or
112+
whether this job is left to some other
113+
system script.</para></listitem>
114+
</varlistentry>
102115
</variablelist>
103116
</refsect1>
104117

‎man/systemd.special.xml.in‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -698,9 +698,9 @@
698698
</refsect1>
699699

700700
<refsect1>
701-
<title>Special Session Units</title>
701+
<title>Special User Units</title>
702702

703-
<para>When systemd runs as a service instance, the
703+
<para>When systemd runs as a user instance, the
704704
following special units are available, which have
705705
similar definitions as their system counterparts:
706706
<filename>default.target</filename>,
@@ -719,22 +719,22 @@
719719
<listitem>
720720
<para>A special service unit
721721
for shutting down the
722-
session.</para>
722+
user service manager.</para>
723723

724724
<para>Applications wanting to
725-
terminate the session should
726-
start this unit. If systemd
727-
receives SIGTERM or SIGINT
728-
when running as session daemon
729-
it will start this
730-
unit.</para>
725+
terminate the user service
726+
manager should start this
727+
unit. If systemd receives
728+
SIGTERM or SIGINT when running
729+
as user service daemon it will
730+
start this unit.</para>
731731

732732
<para>Normally, this pulls in
733733
<filename>shutdown.target</filename>
734734
which in turn should be
735735
conflicted by all units that
736736
want to be shut down on
737-
session exit.</para>
737+
user service manager exit.</para>
738738
</listitem>
739739
</varlistentry>
740740
</variablelist>

0 commit comments

Comments
 (0)
X Tutup