dracut.install: fork, simplify and workaround zfs issues (2)

Signed-off-by: Nowa Ammerlaan <[email protected]>

Author: Nowa-Ammerlaan

hooks/50-dracut.install

@@ -91,11 +91,11 @@ main() {
 			die "Cannot read ${INSTALLKERNEL_STAGING_AREA}/${out}"
 		if [[ ${magic} == MZ ]]; then
 			einfo "Combined UEFI kernel+initramfs executable found"
-			mv "${INSTALLKERNEL_STAGING_AREA}/dracut-tmp" \
+			mv "${INSTALLKERNEL_STAGING_AREA}/${out}" \
 				"${INSTALLKERNEL_STAGING_AREA}/uki.efi" || die "Failed to rename UKI"
 		else
 			einfo "Plain initramfs image found"
-			mv "${INSTALLKERNEL_STAGING_AREA}/dracut-tmp" \
+			mv "${INSTALLKERNEL_STAGING_AREA}/${out}" \
 				"${INSTALLKERNEL_STAGING_AREA}/initrd" || die "Failed to rename initramfs"
 		fi
 	fi

hooks/systemd/52-dracut.install

@@ -62,3 +62,21 @@ INITRAMFS_GEN_ARGS+=(
 )
 
 dracut "${INITRAMFS_GEN_ARGS[@]}" || exit 1
+
+# Fallback path for if we don't know if we generated an initramfs or
+# UKI. If dracut is used in uefi=yes mode, initrd will actually
+# be a combined kernel+initramfs UEFI executable. We can easily
+# recognize it by PE magic (vs cpio for a regular initramfs)
+if [[ ${IMAGE} == dracut-tmp ]]; then
+    read -rn 2 magic <"${KERNEL_INSTALL_STAGING_AREA}/${IMAGE}" ||
+        die "Cannot read ${KERNEL_INSTALL_STAGING_AREA}/${IMAGE}"
+    if [[ ${magic} == MZ ]]; then
+        einfo "Combined UEFI kernel+initramfs executable found"
+        mv "${KERNEL_INSTALL_STAGING_AREA}/${IMAGE}" \
+            "${KERNEL_INSTALL_STAGING_AREA}/uki.efi" || die "Failed to rename UKI"
+    else
+        einfo "Plain initramfs image found"
+        mv "${KERNEL_INSTALL_STAGING_AREA}/${IMAGE}" \
+            "${KERNEL_INSTALL_STAGING_AREA}/initrd" || die "Failed to rename initramfs"
+    fi
+fi