diff options
Diffstat (limited to 'man/machinectl.xml')
| -rw-r--r-- | man/machinectl.xml | 70 |
1 files changed, 6 insertions, 64 deletions
diff --git a/man/machinectl.xml b/man/machinectl.xml index 0e18953700..a7288c249b 100644 --- a/man/machinectl.xml +++ b/man/machinectl.xml @@ -265,16 +265,6 @@ </varlistentry> <varlistentry> - <term><option>--dkr-index-url</option></term> - - <listitem><para>Specifies the index server to use for - downloading <literal>dkr</literal> images with the - <command>pull-dkr</command>. Takes a - <literal>http://</literal>, <literal>https://</literal> - URL.</para></listitem> - </varlistentry> - - <varlistentry> <term><option>--format=</option></term> <listitem><para>When used with the <option>export-tar</option> @@ -761,42 +751,6 @@ </varlistentry> <varlistentry> - <term><command>pull-dkr</command> <replaceable>REMOTE</replaceable> [<replaceable>NAME</replaceable>]</term> - - <listitem><para>Downloads a <literal>dkr</literal> container - image and makes it available locally. The remote name refers - to a <literal>dkr</literal> container name. If omitted, the - local machine name is derived from the <literal>dkr</literal> - container name.</para> - - <para>Image verification is not available for - <literal>dkr</literal> containers, and thus - <option>--verify=no</option> must always be specified with - this command.</para> - - <para>This command downloads all (missing) layers for the - specified container and places them in read-only subvolumes in - <filename>/var/lib/machines/</filename>. A writable snapshot - of the newest layer is then created under the specified local - machine name. To omit creation of this writable snapshot, pass - <literal>-</literal> as local machine name.</para> - - <para>The read-only layer subvolumes are prefixed with - <filename>.dkr-</filename>, and thus not shown by - <command>list-images</command>, unless <option>--all</option> - is passed.</para> - - <para>To specify the <literal>dkr</literal> index server to - use for looking up the specified container, use - <option>--dkr-index-url=</option>.</para> - - <para>Note that pressing C-c during execution of this command - will not abort the download. Use - <command>cancel-transfer</command>, described - below.</para></listitem> - </varlistentry> - - <varlistentry> <term><command>import-tar</command> <replaceable>FILE</replaceable> [<replaceable>NAME</replaceable>]</term> <term><command>import-raw</command> <replaceable>FILE</replaceable> [<replaceable>NAME</replaceable>]</term> <listitem><para>Imports a TAR or RAW container or VM image, @@ -926,12 +880,12 @@ <para>Note that many image operations are only supported, efficient or atomic on btrfs file systems. Due to this, if the <command>pull-tar</command>, <command>pull-raw</command>, - <command>pull-dkr</command>, <command>import-tar</command>, - <command>import-raw</command> and <command>set-limit</command> - commands notice that <filename>/var/lib/machines</filename> is - empty and not located on btrfs, they will implicitly set up a - loopback file <filename>/var/lib/machines.raw</filename> - containing a btrfs file system that is mounted to + <command>import-tar</command>, <command>import-raw</command> and + <command>set-limit</command> commands notice that + <filename>/var/lib/machines</filename> is empty and not located on + btrfs, they will implicitly set up a loopback file + <filename>/var/lib/machines.raw</filename> containing a btrfs file + system that is mounted to <filename>/var/lib/machines</filename>. The size of this loopback file may be controlled dynamically with <command>set-limit</command>.</para> @@ -995,18 +949,6 @@ </example> <example> - <title>Download a Fedora <literal>dkr</literal> image</title> - - <programlisting># machinectl pull-dkr --verify=no mattdm/fedora -# systemd-nspawn -M fedora</programlisting> - - <para>Downloads a <literal>dkr</literal> image and opens a shell - in it. Note that the specified download command might require an - index server to be specified with the - <literal>--dkr-index-url=</literal>.</para> - </example> - - <example> <title>Exports a container image as tar file</title> <programlisting># machinectl export-tar fedora myfedora.tar.xz</programlisting> |