diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-11-15 22:12:41 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-11-15 22:13:26 +0100 |
| commit | af2d49f70bcff20efaf2d69aecaf4b3e898ff1fa (patch) | |
| tree | 3b2e21237d67459424f5e276dda07a9be3575e62 /man/systemd.conf.xml | |
| parent | 62347bc24a695bc0527f663af5fe136b1a993573 (diff) | |
drop support for MANAGER_SESSION, introduce MANAGER_USER instead
Diffstat (limited to 'man/systemd.conf.xml')
| -rw-r--r-- | man/systemd.conf.xml | 17 |
1 files changed, 15 insertions, 2 deletions
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> |