From 03b1e10fc8c3d85e98c38df642158076e97025fa Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Tue, 13 Feb 2024 18:12:42 +0100
Subject: [PATCH 1/3] test: install systemd-boot in openSUSE test images

Needed since 87282a337d1ba7dc7d755f53b46c64b43718dcf7.
---
 test/test-functions | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/test-functions b/test/test-functions
index 80fdcd26b9..0d850098ec 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -1382,6 +1382,7 @@ install_suse_systemd() {
 
     pkgs=(
         systemd
+        systemd-boot
         systemd-container
         systemd-coredump
         systemd-experimental

From 26fff16b901c5b7dac203a00fb6ca52cf451361b Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Tue, 13 Feb 2024 18:16:19 +0100
Subject: [PATCH 2/3] test: make sure that sd-boot is installed before testing
 bootctl

bootctl can be installed also non uefi systems so its sole presence doesn't
mean that we can test installation of sd-boot.
---
 test/units/testsuite-74.bootctl.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/units/testsuite-74.bootctl.sh b/test/units/testsuite-74.bootctl.sh
index 61373b506e..4be7bfd0b8 100755
--- a/test/units/testsuite-74.bootctl.sh
+++ b/test/units/testsuite-74.bootctl.sh
@@ -13,6 +13,11 @@ if ! command -v bootctl >/dev/null; then
     exit 0
 fi
 
+if [[ ! -d /usr/lib/systemd/boot/efi ]]; then
+    echo "sd-boot is not installed, skipping."
+    exit 0
+fi
+
 # shellcheck source=test/units/util.sh
 . "$(dirname "$0")"/util.sh
 

From 08abfd0b8c8e50e6be411ed9c909e6ccc893f223 Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Wed, 14 Feb 2024 10:01:57 +0100
Subject: [PATCH 3/3] test: make sure to install the filesystem package in the
 test image on SUSE

Othewise test images are missing the tmpfiles snippets used to create the very
basic files at boot, which can be useful when a test wants to reuse the OS tree
(is already running in) for spawning a new container in pristine state.
---
 test/test-functions | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/test-functions b/test/test-functions
index 0d850098ec..ce7e03d745 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -1378,6 +1378,9 @@ install_rpm() {
 install_suse_systemd() {
     local pkgs
 
+    dinfo "Install basic filesystem structure"
+    install_rpm filesystem
+
     dinfo "Install SUSE systemd"
 
     pkgs=(