Merging upstream version 256.

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

3 files changed, 38 insertions, 0 deletions

diff --git a/test/TEST-82-SOFTREBOOT/TEST-82-SOFTREBOOT.service b/test/TEST-82-SOFTREBOOT/TEST-82-SOFTREBOOT.service
new file mode 100644
index 0000000..f3892a7
--- /dev/null
+++ b/test/TEST-82-SOFTREBOOT/TEST-82-SOFTREBOOT.service
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+[Unit]
+Description=TEST-82-SOFTREBOOT
+DefaultDependencies=no
+Wants=basic.target multi-user.target
+After=basic.target
+Before=getty-pre.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
+FileDescriptorStoreMax=3
+NotifyAccess=all
diff --git a/test/TEST-82-SOFTREBOOT/meson.build b/test/TEST-82-SOFTREBOOT/meson.build
new file mode 100644
index 0000000..a7c1bf0
--- /dev/null
+++ b/test/TEST-82-SOFTREBOOT/meson.build
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+integration_tests += [
+        integration_test_template + {
+                'name' : fs.name(meson.current_source_dir()),
+                'unit' : files('TEST-82-SOFTREBOOT.service'),
+                'cmdline' : ['systemd.set_credential=kernelcmdlinecred:uff'],
+                'storage' : 'persistent',
+                'vm' : true,
+        },
+]
diff --git a/test/TEST-82-SOFTREBOOT/test.sh b/test/TEST-82-SOFTREBOOT/test.sh
index 0494149..2109cc8 100755
--- a/test/TEST-82-SOFTREBOOT/test.sh
+++ b/test/TEST-82-SOFTREBOOT/test.sh
@@ -7,8 +7,22 @@ TEST_DESCRIPTION="Test Soft-Rebooting"
 IGNORE_MISSING_COVERAGE=yes
 # Prevent shutdown in test suite, the expect script does that manually.
 TEST_SKIP_SHUTDOWN=yes
+IMAGE_NAME="softreboot"
+TEST_NO_NSPAWN=1
+TEST_INSTALL_VERITY_MINIMAL=1
+KERNEL_APPEND="${KERNEL_APPEND:-} systemd.set_credential=kernelcmdlinecred:uff"
 
 # shellcheck source=test/test-functions
 . "$TEST_BASE_DIR/test-functions"
 
+test_require_bin mksquashfs veritysetup sfdisk
+
+test_append_files() {
+    instmods squashfs =squashfs
+    instmods dm_verity =md
+    install_dmevent
+    generate_module_dependencies
+    install_verity_minimal
+}
+
 do_test "$@"