]> code.ossystems Code Review - openembedded-core.git/commitdiff
systemd-container: recommend tar
authorVivien Didelot <vdidelot@pbsc.com>
Mon, 1 Mar 2021 16:53:24 +0000 (11:53 -0500)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 6 Mar 2021 22:36:34 +0000 (22:36 +0000)
If systemd is configured with importd, "machinectl import-*" can be
used to add container trees under /var/lib/machines.

But "machinectl import-tar" makes use of "tar --numeric-owner" which
is not supported by the busybox binary, as shown below:

    # machinectl import-tar /tmp/container.tar.xz
    Enqueued transfer job 1. Press C-c to continue download in background.
    Importing '/tmp/container.tar.xz', saving as 'container'.
    Imported 0%.
    tar: unrecognized option '--numeric-owner'
    BusyBox v1.31.1 () multi-call binary.
    Usage: tar c|x|t [-ZzJjahmvokO] [-f TARFILE] [-C DIR] [-T FILE] [-X FILE] [FILE]...
    Failed to decode and write: Broken pipe
    Exiting.

To fix this, recommend the standard tar package.

Cc: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Vivien Didelot <vdidelot@pbsc.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-core/systemd/systemd_247.3.bb

index 1aac754cfced9a262a06fd3f8a95ef0942d9a839..3454085e5f77645760a4cd45d3ffefcb495fda45 100644 (file)
@@ -484,10 +484,12 @@ FILES_${PN}-container = "${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.c
                          ${datadir}/polkit-1/actions/org.freedesktop.machine1.policy \
                         "
 
+# "machinectl import-tar" uses "tar --numeric-owner", not supported by busybox.
 RRECOMMENDS_${PN}-container += "\
                          ${PN}-journal-gatewayd \
                          ${PN}-journal-remote \
                          ${PN}-journal-upload \
+                         tar \
                         "
 
 FILES_${PN}-extra-utils = "\