Adding upstream version 255.4.upstream/255.4

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 47 insertions, 0 deletions

diff --git a/test/TEST-13-NSPAWN/Makefile b/test/TEST-13-NSPAWN/Makefile
new file mode 120000
index 0000000..e9f93b1
--- /dev/null
+++ b/test/TEST-13-NSPAWN/Makefile
@@ -0,0 +1 @@
+../TEST-01-BASIC/Makefile
\ No newline at end of file
diff --git a/test/TEST-13-NSPAWN/test.sh b/test/TEST-13-NSPAWN/test.sh
new file mode 100755
index 0000000..93af59e
--- /dev/null
+++ b/test/TEST-13-NSPAWN/test.sh
@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+# SPDX-License-Identifier: LGPL-2.1-or-later
+set -e
+
+TEST_DESCRIPTION="systemd-nspawn tests"
+IMAGE_NAME="nspawn"
+TEST_NO_NSPAWN=1
+
+# shellcheck source=test/test-functions
+. "${TEST_BASE_DIR:?}/test-functions"
+
+test_append_files() {
+    local workspace="${1:?}"
+    local container="$workspace/testsuite-13-container-template"
+
+    # Create a dummy container "template" with a minimal toolset, which we can
+    # then use as a base for our nspawn/machinectl tests
+    initdir="$container" setup_basic_dirs
+    initdir="$container" image_install \
+        bash \
+        env \
+        cat \
+        hostname \
+        grep \
+        ip \
+        ls \
+        md5sum \
+        mountpoint \
+        nc \
+        ps \
+        seq \
+        sleep \
+        stat \
+        touch \
+        true
+
+    cp /etc/os-release "$container/usr/lib/os-release"
+    cat >"$container/sbin/init" <<EOF
+#!/bin/bash
+echo "Hello from dummy init, beautiful day, innit?"
+ip link
+EOF
+    chmod +x "$container/sbin/init"
+}
+
+do_test "$@"