diff options
Diffstat (limited to 'man')
| -rw-r--r-- | man/daemon.xml | 6 | ||||
| -rw-r--r-- | man/systemadm.xml | 8 | ||||
| -rw-r--r-- | man/systemctl.xml | 24 | ||||
| -rw-r--r-- | man/systemd.conf.xml | 17 | ||||
| -rw-r--r-- | man/systemd.special.xml.in | 20 | ||||
| -rw-r--r-- | man/systemd.xml | 53 |
6 files changed, 75 insertions, 53 deletions
diff --git a/man/daemon.xml b/man/daemon.xml index 42a7ffd8bb..f592e7d6e2 100644 --- a/man/daemon.xml +++ b/man/daemon.xml @@ -760,8 +760,8 @@ --variable=systemdsystemunitdir</command> (for system services), resp. <command>pkg-config systemd - --variable=systemdsessionunitdir</command> - (for session services). This will make the + --variable=systemduserunitdir</command> + (for user services). This will make the services available in the system on explicit request but not activate them automatically during boot. Optionally, during package @@ -795,7 +795,7 @@ AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_sy machines, and optionally allows their installation even on machines lacking systemd. (Modification of this snippet for the - session unit directory is left as excercise to the + user unit directory is left as excercise to the reader.)</para> <para>Additionally, to ensure that diff --git a/man/systemadm.xml b/man/systemadm.xml index 1377b18c2c..cefc300981 100644 --- a/man/systemadm.xml +++ b/man/systemadm.xml @@ -45,7 +45,7 @@ <refnamediv> <refname>systemadm</refname> <refpurpose>Graphical frontend for the systemd system - and session manager</refpurpose> + and service manager</refpurpose> </refnamediv> <refsynopsisdiv> @@ -58,7 +58,7 @@ <title>Description</title> <para><command>systemadm</command> is a graphical - frontend for the systemd system and session manager + frontend for the systemd system and service manager and allows introspection and control of systemd.</para> </refsect1> @@ -87,10 +87,10 @@ </varlistentry> <varlistentry> - <term><option>--session</option></term> + <term><option>--user</option></term> <listitem><para>Connect to the systemd - session manager of the calling + manager of the calling user.</para></listitem> </varlistentry> diff --git a/man/systemctl.xml b/man/systemctl.xml index 10e0f82441..844d218877 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -44,7 +44,7 @@ <refnamediv> <refname>systemctl</refname> - <refpurpose>Control the systemd system and session manager</refpurpose> + <refpurpose>Control the systemd system and service manager</refpurpose> </refnamediv> <refsynopsisdiv> @@ -59,7 +59,7 @@ <para><command>systemctl</command> may be used to introspect and control the state of the <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry> - system and session manager.</para> + system and service manager.</para> </refsect1> <refsect1> @@ -178,10 +178,10 @@ </varlistentry> <varlistentry> - <term><option>--session</option></term> + <term><option>--user</option></term> <listitem><para>Talk to the systemd - session manager of the calling user.</para></listitem> + manager of the calling user.</para></listitem> </varlistentry> <varlistentry> @@ -224,10 +224,10 @@ <listitem><para>When used with <command>enable</command> and <command>disable</command>, operate on the - global session configuĊation + global user configuĊation directory, thus enabling or disabling a unit file globally for all future - sessions of all users.</para></listitem> + logins of all users.</para></listitem> </varlistentry> <varlistentry> @@ -598,11 +598,11 @@ <para>Depending on whether <option>--system</option>, - <option>--session</option> or + <option>--user</option> or <option>--global</option> is specified this enables the unit for the system, - for sessions of the calling user only - or for all future session of all + for the calling user only + or for all future logins of all users. Note that in the latter case no systemd daemon configuration is reloaded.</para> @@ -643,7 +643,7 @@ <para>This command honours <option>--system</option>, - <option>--session</option>, + <option>--user</option>, <option>--global</option> in a similar way as <command>enable</command>.</para> @@ -942,9 +942,9 @@ <listitem><para>Ask the systemd manager to quit. This is only - supported for session managers + supported for user service managers (i.e. in conjunction with the - <option>--session</option> option) and + <option>--user</option> option) and will fail otherwise.</para></listitem> </varlistentry> </variablelist> diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml index 399cae0a6c..6759f97814 100644 --- a/man/systemd.conf.xml +++ b/man/systemd.conf.xml @@ -49,7 +49,7 @@ <refsynopsisdiv> <para><filename>system.conf</filename></para> - <para><filename>session.conf</filename></para> + <para><filename>user.conf</filename></para> </refsynopsisdiv> <refsect1> @@ -57,7 +57,7 @@ <para>When run as system instance systemd reads the configuration file <filename>system.conf</filename>, - otherwise <filename>session.conf</filename>. These + otherwise <filename>user.conf</filename>. These configuration files contain a few settings controlling basic manager operations.</para> @@ -79,6 +79,7 @@ <term><varname>DumpCore=yes</varname></term> <term><varname>CrashShell=no</varname></term> <term><varname>ShowStatus=yes</varname></term> + <term><varname>SysVConsole=yes</varname></term> <term><varname>CrashChVT=1</varname></term> <listitem><para>Configures various @@ -99,6 +100,18 @@ process. Takes a space-separated list of CPU indexes.</para></listitem> </varlistentry> + + <varlistentry> + <term><varname>MountAuto=yes</varname></term> + <term><varname>SwapAuto=yes</varname></term> + + <listitem><para>Configures whether + systemd should automatically activate + all swap or mounts listed in + <filename>/etc/fstab</filename>, or + whether this job is left to some other + system script.</para></listitem> + </varlistentry> </variablelist> </refsect1> diff --git a/man/systemd.special.xml.in b/man/systemd.special.xml.in index 2855f6a25f..afe882e51f 100644 --- a/man/systemd.special.xml.in +++ b/man/systemd.special.xml.in @@ -698,9 +698,9 @@ </refsect1> <refsect1> - <title>Special Session Units</title> + <title>Special User Units</title> - <para>When systemd runs as a service instance, the + <para>When systemd runs as a user instance, the following special units are available, which have similar definitions as their system counterparts: <filename>default.target</filename>, @@ -719,22 +719,22 @@ <listitem> <para>A special service unit for shutting down the - session.</para> + user service manager.</para> <para>Applications wanting to - terminate the session should - start this unit. If systemd - receives SIGTERM or SIGINT - when running as session daemon - it will start this - unit.</para> + terminate the user service + manager should start this + unit. If systemd receives + SIGTERM or SIGINT when running + as user service daemon it will + start this unit.</para> <para>Normally, this pulls in <filename>shutdown.target</filename> which in turn should be conflicted by all units that want to be shut down on - session exit.</para> + user service manager exit.</para> </listitem> </varlistentry> </variablelist> diff --git a/man/systemd.xml b/man/systemd.xml index f434bfcc58..c6c06e57e9 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -45,7 +45,7 @@ <refnamediv> <refname>systemd</refname> <refname>init</refname> - <refpurpose>systemd System and Session Manager</refpurpose> + <refpurpose>systemd System and Service Manager</refpurpose> </refnamediv> <refsynopsisdiv> @@ -60,7 +60,7 @@ <refsect1> <title>Description</title> - <para>systemd is a system and session manager for + <para>systemd is a system and service manager for Linux operating systems. When run as first process on boot (as PID 1), it acts as init system that brings up and maintains userspace services.</para> @@ -77,7 +77,7 @@ <para>When run as system instance, systemd interprets the configuration file <filename>system.conf</filename>, otherwise - <filename>session.conf</filename>. See + <filename>user.conf</filename>. See <citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry> for more information.</para> </refsect1> @@ -136,10 +136,10 @@ </varlistentry> <varlistentry> <term><option>--system</option></term> - <term><option>--session</option></term> + <term><option>--user</option></term> <listitem><para>Tell systemd to run a - system instance (resp. session + system instance (resp. user instance), even if the process ID is not 1 (resp. is 1), i.e. systemd is not (resp. is) run as init process. @@ -159,27 +159,36 @@ <varlistentry> <term><option>--dump-core</option></term> - <listitem><para>Dump core on crash. This switch has no effect when run as session instance.</para></listitem> + <listitem><para>Dump core on + crash. This switch has no effect when + run as user + instance.</para></listitem> </varlistentry> <varlistentry> <term><option>--crash-shell</option></term> - <listitem><para>Run shell on crash. This switch has no effect when run as session instance.</para></listitem> + <listitem><para>Run shell on + crash. This switch has no effect when + run as user + instance.</para></listitem> </varlistentry> <varlistentry> <term><option>--confirm-spawn</option></term> - <listitem><para>Ask for confirmation when spawning processes. This switch has no effect when run as session instance.</para></listitem> + <listitem><para>Ask for confirmation + when spawning processes. This switch + has no effect when run as user + instance.</para></listitem> </varlistentry> <varlistentry> <term><option>--show-status=</option></term> <listitem><para>Show terse service status information while booting. This - switch has no effect when run as - session instance. Takes a boolean - argument which may be omitted - which is interpreted as + switch has no effect when run as user + instance. Takes a boolean argument + which may be omitted which is + interpreted as <option>true</option>.</para></listitem> </varlistentry> <varlistentry> @@ -188,7 +197,7 @@ <listitem><para>Controls whether output of SysV init scripts will be directed to the console. This switch - has no effect when run as session + has no effect when run as user instance. Takes a boolean argument which may be omitted which is interpreted as @@ -489,10 +498,10 @@ <variablelist> <varlistentry> - <term>Session unit directories</term> + <term>User unit directories</term> <listitem><para>Similar rules apply - for the session unit + for the user unit directories. However, here the <ulink url="http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html">XDG Base Directory specification</ulink> @@ -500,11 +509,11 @@ units. Applications should place their unit files in the directory returned by <command>pkg-config systemd - --variable=systemdsessionunitdir</command>. Global + --variable=systemduserunitdir</command>. Global configuration is done in the directory reported by <command>pkg-config systemd - --variable=systemdsessionconfdir</command>. The + --variable=systemduserconfdir</command>. The <command>enable</command> and <command>disable</command> commands of the @@ -565,12 +574,12 @@ to <command>systemctl daemon-reexec</command>.</para> - <para>systemd session managers will + <para>systemd user managers will start the <filename>exit.target</filename> unit when this signal is received. This is mostly equivalent to - <command>systemctl --session start + <command>systemctl --user start exit.target</command>.</para></listitem> </varlistentry> @@ -585,7 +594,7 @@ <command>systemctl start ctl-alt-del.target</command>.</para> - <para>systemd session managers + <para>systemd user managers treat this signal the same way as SIGTERM.</para></listitem> </varlistentry> @@ -602,7 +611,7 @@ kbrequest.target</command>.</para> <para>This signal is ignored by - systemd session + systemd user managers.</para></listitem> </varlistentry> @@ -757,7 +766,7 @@ <term><varname>$XDG_DATA_HOME</varname></term> <term><varname>$XDG_DATA_DIRS</varname></term> - <listitem><para>The systemd session + <listitem><para>The systemd user manager uses these variables in accordance to the <ulink url="http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html">XDG |