diff options
| -rw-r--r-- | man/systemctl.xml | 207 | ||||
| -rw-r--r-- | src/systemctl/systemctl.c | 7 |
2 files changed, 110 insertions, 104 deletions
diff --git a/man/systemctl.xml b/man/systemctl.xml index 3ac6f628e2..dd9fd995b3 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -386,7 +386,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. querying the user for authentication for privileged operations.</para> </listitem> - </varlistentry> <varlistentry> @@ -993,6 +992,56 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service </varlistentry> <varlistentry> + <term><command>reenable <replaceable>NAME</replaceable>...</command></term> + + <listitem> + <para>Reenable one or more unit files, as specified on the + command line. This is a combination of + <command>disable</command> and <command>enable</command> and + is useful to reset the symlinks a unit is enabled with to + the defaults configured in the <literal>[Install]</literal> + section of the unit file.</para> + </listitem> + </varlistentry> + + <varlistentry> + <term><command>preset <replaceable>NAME</replaceable>...</command></term> + + <listitem> + <para>Reset one or more unit files, as specified on the + command line, to the defaults configured in the preset + policy files. This has the same effect as + <command>disable</command> or <command>enable</command>, + depending how the unit is listed in the preset files.</para> + + <para>Use <option>--preset-mode=</option> to control + whether units shall be enabled and disabled, or only + enabled, or only disabled.</para> + + <para>For more information on the preset policy format, + see + <citerefentry><refentrytitle>systemd.preset</refentrytitle><manvolnum>5</manvolnum></citerefentry>. + For more information on the concept of presets, please + consult the <ulink + url="http://freedesktop.org/wiki/Software/systemd/Preset">Preset</ulink> + document.</para> + </listitem> + </varlistentry> + + <varlistentry> + <term><command>preset-all</command></term> + + <listitem> + <para>Resets all installed unit files to the defaults + configured in the preset policy file (see above).</para> + + <para>Use <option>--preset-mode=</option> to control + whether units shall be enabled and disabled, or only + enabled, or only disabled.</para> + </listitem> + </varlistentry> + + <varlistentry> <term><command>is-enabled <replaceable>NAME</replaceable>...</command></term> <listitem> @@ -1064,56 +1113,6 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service </varlistentry> <varlistentry> - <term><command>reenable <replaceable>NAME</replaceable>...</command></term> - - <listitem> - <para>Reenable one or more unit files, as specified on the - command line. This is a combination of - <command>disable</command> and <command>enable</command> and - is useful to reset the symlinks a unit is enabled with to - the defaults configured in the <literal>[Install]</literal> - section of the unit file.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><command>preset <replaceable>NAME</replaceable>...</command></term> - - <listitem> - <para>Reset one or more unit files, as specified on the - command line, to the defaults configured in the preset - policy files. This has the same effect as - <command>disable</command> or <command>enable</command>, - depending how the unit is listed in the preset files.</para> - - <para>Use <option>--preset-mode=</option> to control - whether units shall be enabled and disabled, or only - enabled, or only disabled.</para> - - <para>For more information on the preset policy format, - see - <citerefentry><refentrytitle>systemd.preset</refentrytitle><manvolnum>5</manvolnum></citerefentry>. - For more information on the concept of presets, please - consult the <ulink - url="http://freedesktop.org/wiki/Software/systemd/Preset">Preset</ulink> - document.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><command>preset-all</command></term> - - <listitem> - <para>Resets all installed unit files to the defaults - configured in the preset policy file (see above).</para> - - <para>Use <option>--preset-mode=</option> to control - whether units shall be enabled and disabled, or only - enabled, or only disabled.</para> - </listitem> - </varlistentry> - - <varlistentry> <term><command>mask <replaceable>NAME</replaceable>...</command></term> <listitem> @@ -1140,25 +1139,6 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service </varlistentry> <varlistentry> - <term><command>add-wants <replaceable>TARGET</replaceable> - <replaceable>NAME</replaceable>...</command></term> - <term><command>add-requires <replaceable>TARGET</replaceable> - <replaceable>NAME</replaceable>...</command></term> - - <listitem> - <para>Adds <literal>Wants=</literal> resp. <literal>Requires=</literal> - dependency to the specified <replaceable>TARGET</replaceable> for - one or more units. </para> - - <para>This command honors <option>--system</option>, - <option>--user</option>, <option>--runtime</option> and - <option>--global</option> in a similar way as - <command>enable</command>.</para> - - </listitem> - </varlistentry> - - <varlistentry> <term><command>link <replaceable>FILENAME</replaceable>...</command></term> <listitem> @@ -1173,20 +1153,21 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service </varlistentry> <varlistentry> - <term><command>get-default</command></term> + <term><command>add-wants <replaceable>TARGET</replaceable> + <replaceable>NAME</replaceable>...</command></term> + <term><command>add-requires <replaceable>TARGET</replaceable> + <replaceable>NAME</replaceable>...</command></term> <listitem> - <para>Get the default target specified - via <filename>default.target</filename> link.</para> - </listitem> - </varlistentry> + <para>Adds <literal>Wants=</literal> resp. <literal>Requires=</literal> + dependency to the specified <replaceable>TARGET</replaceable> for + one or more units. </para> - <varlistentry> - <term><command>set-default <replaceable>NAME</replaceable></command></term> + <para>This command honors <option>--system</option>, + <option>--user</option>, <option>--runtime</option> and + <option>--global</option> in a similar way as + <command>enable</command>.</para> - <listitem> - <para>Set the default target to boot into. Command links - <filename>default.target</filename> to the given unit.</para> </listitem> </varlistentry> @@ -1226,6 +1207,27 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service <filename>/run</filename>.</para> </listitem> </varlistentry> + + <varlistentry> + <term><command>get-default</command></term> + + <listitem> + <para>Return the default target to boot into. This returns + the target unit name <filename>default.target</filename> + is aliased (symlinked) to.</para> + </listitem> + </varlistentry> + + <varlistentry> + <term><command>set-default <replaceable>NAME</replaceable></command></term> + + <listitem> + <para>Set the default target to boot into. This sets + (symlinks) the <filename>default.target</filename> alias + to the given target unit.</para> + </listitem> + </varlistentry> + </variablelist> </refsect2> @@ -1547,6 +1549,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service <quote>firmware over the air</quote> update.</para> </listitem> </varlistentry> + <varlistentry> <term><command>kexec</command></term> @@ -1560,6 +1563,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service immediately followed by the reboot.</para> </listitem> </varlistentry> + <varlistentry> <term><command>exit</command></term> @@ -1569,8 +1573,29 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service with the <option>--user</option> option) and will fail otherwise.</para> </listitem> + </varlistentry> + <varlistentry> + <term><command>switch-root <replaceable>ROOT</replaceable> <optional><replaceable>INIT</replaceable></optional></command></term> + + <listitem> + <para>Switches to a different root directory and executes a + new system manager process below it. This is intended for + usage in initial RAM disks ("initrd"), and will transition + from the initrd's system manager process (a.k.a "init" + process) to the main system manager process. This call takes two + arguments: the directory that is to become the new root directory, and + the path to the new system manager binary below it to + execute as PID 1. If the latter is omitted or the empty + string, a systemd binary will automatically be searched for + and used as init. If the system manager path is omitted or + equal to the empty string, the state of the initrd's system + manager process is passed to the main system manager, which + allows later introspection of the state of the services + involved in the initrd boot.</para> + </listitem> </varlistentry> + <varlistentry> <term><command>suspend</command></term> @@ -1580,6 +1605,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service </para> </listitem> </varlistentry> + <varlistentry> <term><command>hibernate</command></term> @@ -1589,6 +1615,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service </para> </listitem> </varlistentry> + <varlistentry> <term><command>hybrid-sleep</command></term> @@ -1598,26 +1625,6 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service <filename>hybrid-sleep.target</filename> target.</para> </listitem> </varlistentry> - <varlistentry> - <term><command>switch-root <replaceable>ROOT</replaceable> <optional><replaceable>INIT</replaceable></optional></command></term> - - <listitem> - <para>Switches to a different root directory and executes a - new system manager process below it. This is intended for - usage in initial RAM disks ("initrd"), and will transition - from the initrd's system manager process (a.k.a "init" - process) to the main system manager process. This call takes two - arguments: the directory that is to become the new root directory, and - the path to the new system manager binary below it to - execute as PID 1. If the latter is omitted or the empty - string, a systemd binary will automatically be searched for - and used as init. If the system manager path is omitted or - equal to the empty string, the state of the initrd's system - manager process is passed to the main system manager, which - allows later introspection of the state of the services - involved in the initrd boot.</para> - </listitem> - </varlistentry> </variablelist> </refsect2> diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index ded4943c10..74528dd5b6 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -6075,7 +6075,7 @@ static void systemctl_help(void) { " based on preset configuration\n" " preset-all Enable/disable all unit files based on\n" " preset configuration\n" - " is-enabled NAME... Check whether unit files are enabled\n\n" + " is-enabled NAME... Check whether unit files are enabled\n" " mask NAME... Mask one or more units\n" " unmask NAME... Unmask one or more units\n" " link PATH... Link one or more units files into\n" @@ -6084,10 +6084,9 @@ static void systemctl_help(void) { " on specified one or more units\n" " add-requires TARGET NAME... Add 'Requires' dependency for the target\n" " on specified one or more units\n" - " get-default Get the name of the default target\n" - " set-default NAME Set the default target\n" " edit NAME... Edit one or more unit files\n" - "\n" + " get-default Get the name of the default target\n" + " set-default NAME Set the default target\n\n" "Machine Commands:\n" " list-machines [PATTERN...] List local containers and host\n\n" "Job Commands:\n" |