[systemd-commits] 2 commits - TODO man/machinectl.xml

[Lennart Poettering]

 TODO               |   10 ++++++++--
 man/machinectl.xml |   47 +++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 49 insertions(+), 8 deletions(-)

New commits:
commit af40e5d3acbdcff09c8809cd1b86ecf8871f65f0
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Mar 9 21:34:32 2015 +0100

    man: document machinectl import-tar and import-raw

diff --git a/man/machinectl.xml b/man/machinectl.xml
index 55bb694..7aeff68 100644
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -670,18 +670,51 @@
       </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,
+        and places it under the specified name in
+        <filename>/var/lib/machines/</filename>. When
+        <command>import-tar</command> is used the file specified as
+        first argument should be a tar archive, possibly compressed
+        with xz, gzip or bzip2. It will then be unpacked into its own
+        subvolume in <filename>/var/lib/machines</filename>. When
+        <command>import-raw</command> is used the file should be a
+        qcow2 or raw disk image, possibly compressed with xz, gzip or
+        bzip2. If the second argument (the resulting image name) is
+        not specified it is automatically derived from the file
+        name. If the file name is passed as <literal>-</literal> the
+        image is read from standard input, in which case the second
+        argument is mandatory.</para>
+
+        <para>Similar as with <command>pull-tar</command>,
+        <command>pull-raw</command> the file system
+        <filename>/var/lib/machines.raw</filename> is increased in
+        size of necessary and appropriate. Optionally the
+        <option>--read-only</option> switch may be used to create a
+        read-only container or VM image. No cryptographic validation
+        is done when importing the images.</para>
+
+        <para>Much like image downloads, ongoing imports may be listed
+        with <command>list-transfers</command> and aborted with
+        <command>cancel-transfer</command>.</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
         <term><command>list-transfers</command></term>
 
         <listitem><para>Shows a list of container or VM image
-        downloads that are currently in progress.</para></listitem>
+        downloads and imports that are currently in
+        progress.</para></listitem>
       </varlistentry>
 
       <varlistentry>
         <term><command>cancel-transfers</command> <replaceable>ID</replaceable>...</term>
 
-        <listitem><para>Aborts download of the container or VM image
-        with the specified ID. To list ongoing transfers and their
-        IDs, use <command>list-transfers</command>. </para></listitem>
+        <listitem><para>Aborts a download or import of the container
+        or VM image with the specified ID. To list ongoing transfers
+        and their IDs, use
+        <command>list-transfers</command>. </para></listitem>
       </varlistentry>
 
     </variablelist></refsect2>
@@ -705,13 +738,15 @@
     <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> and <command>set-limit</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
     <filename>/var/lib/machines</filename>. The size of this loopback
-    file may be controlled dynamically with <command>set-limit</command>.</para>
+    file may be controlled dynamically with
+    <command>set-limit</command>.</para>
 
     <para>Disk images are understood by
     <citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry>

commit 124f2f9b6f66db00942b5882d68aa8fa8857865e
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Mar 9 20:06:18 2015 +0100

    update TODO

diff --git a/TODO b/TODO
index 60efaaf..18b1c49 100644
--- a/TODO
+++ b/TODO
@@ -32,6 +32,14 @@ External:
 * When lz4 gets an API for lz4 command output, make use of it to
   compress coredumps in a way compatible with /usr/bin/lz4.
 
+Before 220:
+
+* rework fsckd/fsck's connection logic or remove fsck entirely
+
+* fix userns support in nspawn, or remove it entirely
+
+* make unmount-on-eject work again
+
 Features:
 
 * create a btrfs qgroup for /var/lib/machines, and add all container
@@ -114,8 +122,6 @@ Features:
 
 * import-dkr: convert json bits to nspawn configuration
 
-* import: support import from local files, and export to local files
-
 * core/cgroup: support net_cls modules, and support automatically allocating class ids, then add support for making firewall changes depending on it, to implement a per-service firewall
 
 * introduce systemd-nspawn-ephemeral at .service, and hook it into "machinectl start" with a new --ephemeral switch