Arch Linux User Repository

@Prototik

Could you add a check to the set-default, so it doesn't show an error for people not using systemd-boot? Thanks.

-    if [[ "$pkgbase" == "$default_kernel_package" && "$variant" == "default" ]]; then
+    if [[ "$pkgbase" == "$default_kernel_package" && "$variant" == "default" && $(bootctl is-installed --quiet) ]]; then

Thanks, @BotH!

@Shished

--- dracut-ukify       2023-07-27 20:24:07.571779869 +0300
+++ /usr/bin/dracut-ukify       2023-07-27 20:24:46.065818807 +0300
@@ -218,12 +218,10 @@
     ukify_args+=(--uname "$version")
     ukify_args+=(--os-release "@$os_release")
     ukify_args+=(--output "$image")
-    ukify_args+=(--linux "$vmlinuz")
-    ukify_args+=(--initrd "$initrd")

     echo "==> Ukify image $kernel ($version_name)"

-    /usr/lib/systemd/ukify build "${ukify_args[@]}"
+    /usr/lib/systemd/ukify "$vmlinuz" "$initrd" "${ukify_args[@]}"

     # Remove temporary files
     rm "$initrd"

After updating to 6-1 it fails to execute the ukify commands

ukify: error: unrecognized arguments: --linux /usr/lib/modules/6.4.6-zen1-1-zen/vmlinuz --initrd /tmp/tmp.HUGrFK1HHj

Can you add an option to use xbootldr partition instead for esp for installation? If it is mounted, its path can be shown with bootctl -x command.

I had to do mkdir /efi/EFI/Linux

# Mark image as default if needed
if [[ "$pkgbase" == "$default_kernel_package" && "$variant" == "default" ]]; then
  echo "===> Mark linux image $kernel ($version) as default"
  bootctl set-default "$(basename "$image")" || {
    echo "==> Unable to mark linux image $kernel ($version) as default due to error" >&2
  }
fi

@Prototik Thanks for the implementation, seems to work!

One thing, bootctl set-default does not work, when someone doesn't use systemd-boot. This currently prints an error message when generating the UKI. That's why I removed it in my patch. But I don't know if there is a good non hacky way to set it automatically (if the path is dynamic).

@jonas-w latest update adds option to customize UKI image location, now you can use this package without custom patches to store UKI for UEFI default location, can you try it and give some feedback if you wish?

If someone wants to use the EFI directly without systemd-boot, I created a patch which installs the efi to EFI/BOOT/BOOTX64.efi if you set it as default kernel package otherwise to EFI/BOOT/BOOTX64-$pkgname.efi. Feel free to use this, but with no warranty.

--- /usr/bin/dracut-ukify   2023-04-15 13:49:56.000000000 +0200
+++ dracut-ukify    2023-04-15 15:43:31.073418694 +0200
@@ -79,7 +79,13 @@
           path="$(grep -lE "^${pkgbase}\$" /usr/lib/modules/*/pkgbase)"
           version=$(basename "${path%/pkgbase}")
           for variant in "${!ukify_variants[@]}"; do
-            IMAGE="${ESP_PATH}/EFI/Linux/$(variant_name "linux-$version-$MACHINE_ID-$BUILD_ID" "$variant").efi"
+
+            if [[ "$pkgbase" == "$default_kernel_package" ]]; then
+              IMAGE="${ESP_PATH}/EFI/BOOT/BOOTX64.efi"
+            else
+              IMAGE="${ESP_PATH}/EFI/BOOT/BOOTX64-${pkgbase}.efi"
+            fi
+            #IMAGE="${ESP_PATH}/EFI/Linux/$(variant_name "linux-$version-$MACHINE_ID-$BUILD_ID" "$variant").efi"
             if [ -f "$IMAGE" ]; then
               echo "==> Removing $IMAGE..."
               rm -f "$IMAGE"
@@ -127,7 +133,14 @@
   vmlinuz="/usr/lib/modules/${version}/vmlinuz"

   for variant in "${!ukify_variants[@]}"; do
-    image="${ESP_PATH}/EFI/Linux/$(variant_name "linux-${version}-${MACHINE_ID}-${BUILD_ID}" "$variant").efi"
+
+
+    if [[ "$pkgbase" == "$default_kernel_package" ]]; then
+      image="${ESP_PATH}/EFI/BOOT/BOOTX64.efi"
+    else
+      image="${ESP_PATH}/EFI/BOOT/BOOTX64-${pkgbase}.efi"
+    fi
+    #image="${ESP_PATH}/EFI/Linux/$(variant_name "linux-${version}-${MACHINE_ID}-${BUILD_ID}" "$variant").efi"
     version_name=$(variant_name "$version" "$variant")

     read -r pkgbase < "$path"
@@ -135,7 +148,7 @@
     initrd=$(mktemp)

     echo "==> Building initrd image $kernel ($version_name)"
-    dracut -q -f --no-hostonly-cmdline --kver "${version}" ${ukify_variants[$variant]} "$initrd"
+    dracut -f --no-hostonly-cmdline --kver "${version}" ${ukify_variants[$variant]} "$initrd"

     os_release=$(mktemp)
     grep -v '^BUILD_ID=' /etc/os-release > "$os_release"
@@ -156,14 +169,6 @@
     rm "$initrd"
     rm "$os_release"
   done
-
-  # Mark image as default if needed
-  if [[ "$pkgbase" == "$default_kernel_package" ]]; then
-    echo "===> Mark linux image $kernel ($version) as default"
-    bootctl set-default "linux-${version}-${MACHINE_ID}-${BUILD_ID}.efi" || {
-       echo "==> Unable to mark linux image $kernel ($version) as default due to error" >&2
-    }
-  fi
 }

 for kernel in "${!kernels[@]}"; do