feat(rescue): move command line arguments to 50-rescue.conf

The benefit of this change is that even if kernel-install
is not used (e.g. direct user invocation), the correct
kernel command line options will be set for the generated
rescue image.

diff --git a/dracut.conf.d/rescue/50-rescue.conf b/dracut.conf.d/rescue/50-rescue.conf
index 943e56c9f7eed401268e9e9b6e57308655ec4753..dc5d39825ed42369e000be601a2942afbd5072ed 100644 (file)
--- a/dracut.conf.d/rescue/50-rescue.conf
+++ b/dracut.conf.d/rescue/50-rescue.conf
@@ -2,3 +2,4 @@ dracut_rescue_image="yes"
 hostonly="no"
 add_dracutmodules+=" rescue "
 uefi="no"
+kernel_cmdline=" rd.auto=1 "

diff --git a/install.d/51-dracut-rescue.install b/install.d/51-dracut-rescue.install
index e04414e1f0053c26b242063a97f4fb2654591237..4ec9e3c5df164bf831dafe2617503662b0cd2ac8 100755 (executable)
--- a/install.d/51-dracut-rescue.install
+++ b/install.d/51-dracut-rescue.install
@@ -145,7 +145,7 @@ case "$COMMAND" in
                 echo "title      $PRETTY_NAME - Rescue Image"
                 echo "version    $KERNEL_VERSION"
                 echo "machine-id $MACHINE_ID"
-                echo "options    ${BOOT_OPTIONS[*]} rd.auto=1"
+                echo "options    ${BOOT_OPTIONS[*]}"
                 echo "linux      $BOOT_DIR/linux"
                 echo "initrd     $BOOT_DIR/initrd"
             } > "$LOADER_ENTRY"