From: Harald Hoyer <harald@redhat.com>
Date: Mon, 20 Mar 2017 10:41:07 +0000 (+0100)
Subject: Correct path for UEFI stub
X-Git-Tag: 045~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53475faa817814d9f1a20fc8669794b38533f9cf;p=thirdparty%2Fdracut.git

Correct path for UEFI stub

respect any $prefix given to the systemd installation

https://github.com/dracutdevs/dracut/pull/196
---

diff --git a/dracut.8.asc b/dracut.8.asc
index 4ab0872f8..ca1691898 100644
--- a/dracut.8.asc
+++ b/dracut.8.asc
@@ -498,8 +498,8 @@ will not be able to boot.
 **--uefi-stub _<FILE>_**::
     Specifies the UEFI stub loader, which will load the attached kernel, initramfs and
     kernel command line and boots the kernel. The default is
-    _/lib/systemd/boot/efi/linux<EFI-MACHINE-TYPE-NAME>.efi.stub_
-    or _/usr/lib/gummiboot/linux<EFI-MACHINE-TYPE-NAME>.efi.stub_
+    _$prefix/lib/systemd/boot/efi/linux<EFI-MACHINE-TYPE-NAME>.efi.stub_
+    or _$prefix/lib/gummiboot/linux<EFI-MACHINE-TYPE-NAME>.efi.stub_
 
 **--kernel-image _<FILE>_**::
     Specifies the kernel image, which to include in the UEFI executable. The default is
diff --git a/dracut.asc b/dracut.asc
index b047a3376..f2470e045 100644
--- a/dracut.asc
+++ b/dracut.asc
@@ -132,7 +132,7 @@ The following steps are executed during a shutdown:
 
 * systemd switches to the shutdown.target
 * systemd starts
-  /lib/systemd/system/shutdown.target.wants/dracut-shutdown.service
+  $prefix/lib/systemd/system/shutdown.target.wants/dracut-shutdown.service
 * dracut-shutdown.service executes /usr/lib/dracut/dracut-initramfs-restore
   which unpacks the initramfs to /run/initramfs
 * systemd finishes shutdown.target
diff --git a/dracut.sh b/dracut.sh
index a94401f67..788e52bf8 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -1029,7 +1029,7 @@ if [[ ! $print_cmdline ]]; then
 
         if ! [[ -s $uefi_stub ]]; then
             for uefi_stub in \
-                "/lib/systemd/boot/efi/linux${EFI_MACHINE_TYPE_NAME}.efi.stub" \
+                "${systemdutildir}/boot/efi/linux${EFI_MACHINE_TYPE_NAME}.efi.stub" \
                     "/usr/lib/gummiboot/linux${EFI_MACHINE_TYPE_NAME}.efi.stub"; do
                 [[ -s $uefi_stub ]] || continue
                 break