diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-03-18 04:44:39 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-03-18 04:48:26 +0100 |
| commit | 1dba654b27918c22e413ac5b3c19301f1ff86ad2 (patch) | |
| tree | 93e2ac845e4edebf7a1cf805a6decd1518630321 /man | |
| parent | de58a50e24a0d55e3bbcc77f8f6170a7322acf52 (diff) | |
machinectl: reimplement machinectl's "reboot" verb on top of "kill", and add new verb "poweroff"
There's really no point to send the reboot SIGINT from machinectl
directly, if machined can do that anyway. This saves code, and
makes machinectl network transparent for these verbs. And while we are
at it we can easily add a "poweroff" verb in addition to "reboot". Yay!
Diffstat (limited to 'man')
| -rw-r--r-- | man/machinectl.xml | 72 |
1 files changed, 45 insertions, 27 deletions
diff --git a/man/machinectl.xml b/man/machinectl.xml index 89dca9cf89..2f2e2571f5 100644 --- a/man/machinectl.xml +++ b/man/machinectl.xml @@ -203,14 +203,45 @@ </varlistentry> <varlistentry> - <term><command>terminate</command> <replaceable>ID</replaceable>...</term> + <term><command>login</command> <replaceable>ID</replaceable></term> - <listitem><para>Terminates a virtual - machine or container. This kills all - processes of the virtual machine or - container and deallocates all - resources attached to that - instance.</para></listitem> + <listitem><para>Open a terminal login + session to a container. This will + create a TTY connection to a specific + container and asks for the execution of a + getty on it. Note that this is only + supported for containers running + <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry> + as init system.</para></listitem> + </varlistentry> + + <varlistentry> + <term><command>reboot</command> <replaceable>ID</replaceable>...</term> + + <listitem><para>Reboot one or more + containers. This will trigger a reboot + by sending SIGINT to the container's + init process, which is roughly + equivalent to pressing Ctrl+Alt+Del on + a non-containerized system, and is + compatible with containers running any + init system.</para></listitem> + </varlistentry> + + <varlistentry> + <term><command>poweroff</command> <replaceable>ID</replaceable>...</term> + + <listitem><para>Power off one or more + containers. This will trigger a reboot + by sending SIGRTMIN+4 to the + container's init process, which causes + systemd-compatible init systems to + shut down cleanly. This operation does + not work on containers that do not run + a + <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>-compatible + init system, such as + sysvinit.</para></listitem> </varlistentry> <varlistentry> @@ -229,29 +260,16 @@ </varlistentry> <varlistentry> - <term><command>reboot</command> <replaceable>ID</replaceable>...</term> + <term><command>terminate</command> <replaceable>ID</replaceable>...</term> - <listitem><para>Reboot one or more - containers. This will trigger a reboot - by sending SIGINT to the container's - init process, which is roughly - equivalent to pressing Ctrl+Alt+Del on - a non-containerized - system.</para></listitem> + <listitem><para>Terminates a virtual + machine or container. This kills all + processes of the virtual machine or + container and deallocates all + resources attached to that + instance.</para></listitem> </varlistentry> - <varlistentry> - <term><command>login</command> <replaceable>ID</replaceable></term> - - <listitem><para>Open a terminal login - session to a container. This will - create a TTY connection to a specific - container and asks for the execution of a - getty on it. Note that this is only - supported for containers running - <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry> - as init system.</para></listitem> - </varlistentry> </variablelist> </refsect1> |