From: Jo Zzsi <jozzsicsataban@gmail.com>
Date: Wed, 21 Aug 2024 23:20:43 +0000 (-0400)
Subject: fix(rescue): make rescue always no-hostonly
X-Git-Tag: 104~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=224c00914bfb4ba1dee48e094ebb137facfd5947;p=thirdparty%2Fdracut-ng.git

fix(rescue): make rescue always no-hostonly

Currently the rescue image is only set to no-hostonly if it is
generated via dracut-rescue.install. Make the rescue image
generation more predictable and consistent by setting no-hostonly
right in the rescue config.
---

diff --git a/dracut.conf.d/50-rescue.conf.example b/dracut.conf.d/50-rescue.conf.example
deleted file mode 100644
index 6d6a1708b..000000000
--- a/dracut.conf.d/50-rescue.conf.example
+++ /dev/null
@@ -1 +0,0 @@
-dracut_rescue_image="yes"
diff --git a/dracut.conf.d/rescue/50-rescue.conf b/dracut.conf.d/rescue/50-rescue.conf
new file mode 100644
index 000000000..943e56c9f
--- /dev/null
+++ b/dracut.conf.d/rescue/50-rescue.conf
@@ -0,0 +1,4 @@
+dracut_rescue_image="yes"
+hostonly="no"
+add_dracutmodules+=" rescue "
+uefi="no"
diff --git a/install.d/51-dracut-rescue.install b/install.d/51-dracut-rescue.install
index 25f75557a..e04414e1f 100755
--- a/install.d/51-dracut-rescue.install
+++ b/install.d/51-dracut-rescue.install
@@ -131,8 +131,8 @@ case "$COMMAND" in
 
         if [[ ! -f "$BOOT_DIR_ABS/$INITRD" ]]; then
             # shellcheck disable=SC2046
-            dracut -f --no-hostonly --no-uefi \
-                -a "rescue" \
+            dracut -f \
+                --add-confdir rescue \
                 $([[ $KERNEL_INSTALL_VERBOSE == 1 ]] && echo --verbose) \
                 --kver "$KERNEL_VERSION" \
                 "$BOOT_DIR_ABS/$INITRD"