File 0005-TEST-24-CRYPTSETUP-fix-for-SLE15SP6.patch of Package systemd

Overview Repositories Revisions Requests Users Attributes Meta

File 0005-TEST-24-CRYPTSETUP-fix-for-SLE15SP6.patch of Package systemd

From 7db70c278c73c02a37bd1db6672f11e07b7e88bc Mon Sep 17 00:00:00 2001
From: Thomas Blume <Thomas.Blume@suse.com>
Date: Tue, 30 Jan 2024 17:00:35 +0100
Subject: [PATCH 5/6] TEST-24-CRYPTSETUP fix for SLE15SP6

(cherry picked from commit d4dbf7d08805c032ed4940912aa45d22475a7494)
---
 test/TEST-24-CRYPTSETUP/test.sh | 2 +-
 test/test-functions             | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/test/TEST-24-CRYPTSETUP/test.sh b/test/TEST-24-CRYPTSETUP/test.sh
index eace3f23c0..dc9d00372d 100755
--- a/test/TEST-24-CRYPTSETUP/test.sh
+++ b/test/TEST-24-CRYPTSETUP/test.sh
@@ -81,7 +81,7 @@ EOF
         dinfo "Generating a custom initrd with dm-crypt support in '${INITRD:?}'"
 
         if command -v dracut >/dev/null; then
-            dracut --force --verbose --add crypt "$INITRD"
+            dracut --force --verbose --add-drivers ext4 --add crypt "$INITRD"
         elif command -v mkinitcpio >/dev/null; then
             mkinitcpio --addhooks sd-encrypt --generate "$INITRD"
         elif command -v mkinitramfs >/dev/null; then
diff --git a/test/test-functions b/test/test-functions
index 7b7178c7ab..45d3356041 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -3032,11 +3032,17 @@ inst_rules() {
     local target=/etc/udev/rules.d
     local found rule
 
+     if get_bool "$LOOKS_LIKE_SUSE"; then
+         local sourcedir=/usr/lib/udev/rules.d
+     else
+         local sourcedir=/lib/udev/rules.d
+     fi
+
     inst_dir "/lib/udev/rules.d"
     inst_dir "$target"
     for rule in "$@"; do
         if [ "${rule#/}" = "$rule" ]; then
-            for r in /lib/udev/rules.d /etc/udev/rules.d; do
+            for r in "$sourcedir" /etc/udev/rules.d; do
                 if [[ -f "$r/$rule" ]]; then
                     found="$r/$rule"
                     inst_simple "$found"
-- 
2.43.0

Places

File 0005-TEST-24-CRYPTSETUP-fix-for-SLE15SP6.patch of Package systemd

Places