From: Daniel Molkentin <dmolkentin@suse.com>
Date: Tue, 1 Dec 2020 23:18:37 +0000 (+0100)
Subject: Revert "Add --uefi-output for custom output filename"
X-Git-Tag: 051~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a12309c0d29411153321e429247474f0b43f8f2;p=thirdparty%2Fdracut.git

Revert "Add --uefi-output for custom output filename"

This reverts commit f8f3b0f3588273e69b345d6d0602d6d2a1c5a819.
---

diff --git a/dracut-bash-completion.sh b/dracut-bash-completion.sh
index 3104c3ebd..913471017 100644
--- a/dracut-bash-completion.sh
+++ b/dracut-bash-completion.sh
@@ -38,7 +38,7 @@ _dracut() {
                               --fwdir --libdirs --fscks --add-fstab --mount --device --nofscks
                               --kmoddir --conf --confdir --tmpdir --stdlog --compress --prefix
                               --kernel-cmdline --sshkey --persistent-policy --install-optional
-                              --loginstall --uefi-stub --kernel-image --uefi-output
+                              --loginstall --uefi-stub --kernel-image
                               '
         )
 
diff --git a/dracut.8.asc b/dracut.8.asc
index cc099dc25..b99019e50 100644
--- a/dracut.8.asc
+++ b/dracut.8.asc
@@ -524,9 +524,6 @@ will not be able to boot.
     Specifies the UEFI stub loader's splash image. Requires bitmap (**.bmp**) image
     format.
 
-**--uefi-output _<FILE>_**::
-    Specifies the UEFI application output filename, uses default if not set.
-
 **--kernel-image _<FILE>_**::
     Specifies the kernel image, which to include in the UEFI executable. The default is
     _/lib/modules/<KERNEL-VERSION>/vmlinuz_ or _/boot/vmlinuz-<KERNEL-VERSION>_
@@ -677,8 +674,6 @@ David Dillow
 
 Will Woods
 
-Léo Le Bouter
-
 SEE ALSO
 --------
 *dracut.cmdline*(7) *dracut.conf*(5) *lsinitrd*(1)
diff --git a/dracut.conf.5.asc b/dracut.conf.5.asc
index 48255bdef..f206f2f7b 100644
--- a/dracut.conf.5.asc
+++ b/dracut.conf.5.asc
@@ -209,9 +209,6 @@ provide a valid _/etc/fstab_.
 *uefi_splash_image=*"_<FILE>_"::
     Specifies the UEFI stub loader's splash image. Requires bitmap (**.bmp**) image format.
 
-*uefi_output=*"_<FILE>_"::
-    Specifies the UEFI application output filename, uses default if not set.
-
 *uefi_secureboot_cert=*"_<FILE>_", *uefi_secureboot_key=*"_<FILE>_"::
     Specifies a certificate and corresponding key, which are used to sign the created UEFI executable.
     Requires both certificate and key need to be specified and _sbsign_ to be installed.
@@ -235,8 +232,6 @@ AUTHOR
 ------
 Harald Hoyer
 
-Léo Le Bouter
-
 See Also
 --------
 *dracut*(8) *dracut.cmdline*(7)
diff --git a/dracut.sh b/dracut.sh
index 117c84af4..0f4648397 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -241,8 +241,6 @@ Creates initial ramdisk images for preloading modules
   --uefi-splash-image [FILE]
                         Use [FILE] as a splash image when creating an UEFI
                         executable
-  --uefi-output [FILE]  Use [FILE] as output filename when creating an UEFI
-                        executable
   --kernel-image [FILE] location of the kernel image
   --regenerate-all      Regenerate all initramfs images at the default location
                         for the kernel versions found on the system
@@ -425,7 +423,6 @@ rearrange_params()
         --long uefi \
         --long uefi-stub: \
         --long uefi-splash-image: \
-        --long uefi-output: \
         --long kernel-image: \
         --long no-hostonly-i18n \
         --long hostonly-i18n \
@@ -630,8 +627,6 @@ while :; do
                        uefi_stub_l="$2";               PARMS_TO_STORE+=" '$2'"; shift;;
         --uefi-splash-image)
                        uefi_splash_image_l="$2";       PARMS_TO_STORE+=" '$2'"; shift;;
-        --uefi-output)
-                       uefi_output_l="$2";             PARMS_TO_STORE+=" '$2'"; shift;;
         --kernel-image)
                        kernel_image_l="$2";            PARMS_TO_STORE+=" '$2'"; shift;;
         --no-machineid)
@@ -816,7 +811,6 @@ stdloglvl=$((stdloglvl + verbosity_mod_l))
 [[ $loginstall_l ]] && loginstall="$loginstall_l"
 [[ $uefi_stub_l ]] && uefi_stub="$uefi_stub_l"
 [[ $uefi_splash_image_l ]] && uefi_splash_image="$uefi_splash_image_l"
-[[ $uefi_output_l ]] && uefi_output="$uefi_output_l"
 [[ $kernel_image_l ]] && kernel_image="$kernel_image_l"
 [[ $machine_id_l ]] && machine_id="$machine_id_l"
 
@@ -836,31 +830,27 @@ if ! [[ $outfile ]]; then
             exit 1
         fi
 
-        if [[ -z "$uefi_output" ]]; then
-            BUILD_ID=$(cat $dracutsysrootdir/etc/os-release $dracutsysrootdir/usr/lib/os-release \
-                           | while read -r line || [[ $line ]]; do \
-                           [[ $line =~ BUILD_ID\=* ]] && eval "$line" && echo "$BUILD_ID" && break; \
-                       done)
-            if [[ -z $dracutsysrootdir ]]; then
-                if [[ -d /efi ]] && mountpoint -q /efi; then
-                    efidir=/efi/EFI
-                else
-                    efidir=/boot/EFI
-                    if [[ -d $dracutsysrootdir/boot/efi/EFI ]]; then
-                        efidir=/boot/efi/EFI
-                    fi
-                fi
+        BUILD_ID=$(cat $dracutsysrootdir/etc/os-release $dracutsysrootdir/usr/lib/os-release \
+                       | while read -r line || [[ $line ]]; do \
+                       [[ $line =~ BUILD_ID\=* ]] && eval "$line" && echo "$BUILD_ID" && break; \
+                   done)
+        if [[ -z $dracutsysrootdir ]]; then
+            if [[ -d /efi ]] && mountpoint -q /efi; then
+                efidir=/efi/EFI
             else
                 efidir=/boot/EFI
                 if [[ -d $dracutsysrootdir/boot/efi/EFI ]]; then
                     efidir=/boot/efi/EFI
                 fi
             fi
-            mkdir -p "$dracutsysrootdir$efidir/Linux"
-            outfile="$dracutsysrootdir$efidir/Linux/linux-$kernel${MACHINE_ID:+-${MACHINE_ID}}${BUILD_ID:+-${BUILD_ID}}.efi"
         else
-            outfile="$uefi_output"
+            efidir=/boot/EFI
+            if [[ -d $dracutsysrootdir/boot/efi/EFI ]]; then
+                efidir=/boot/efi/EFI
+            fi
         fi
+        mkdir -p "$dracutsysrootdir$efidir/Linux"
+        outfile="$dracutsysrootdir$efidir/Linux/linux-$kernel${MACHINE_ID:+-${MACHINE_ID}}${BUILD_ID:+-${BUILD_ID}}.efi"
     else
         if [[ -e "$dracutsysrootdir/boot/vmlinuz-$kernel" ]]; then
             outfile="/boot/initramfs-$kernel.img"