*: prefer systemd-boot stub to gummiboot

supported on more versions of linux (6.2+ without EFI_HANDOVER) and supports more features (like splash images, better secureboot support)
zbm-dev · Feb 3, 2024 · e8b0153 · e8b0153
1 parent c83f534
commit e8b0153
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/bin/generate-zbm b/bin/generate-zbm
@@ -683,8 +683,8 @@ sub createUEFIBundle {
 
     # For now, default stub locations are x86_64 only
     my @uefi_stub_defaults = qw(
-      /usr/lib/gummiboot/linuxx64.efi.stub
       /usr/lib/systemd/boot/efi/linuxx64.efi.stub
+      /usr/lib/gummiboot/linuxx64.efi.stub
     );
 
     foreach my $stubloc (@uefi_stub_defaults) {

diff --git a/docs/guides/void-linux/_include/zbm-install.rst b/docs/guides/void-linux/_include/zbm-install.rst
@@ -15,7 +15,7 @@ Install ZFSBootMenu
 
     .. code-block::
 
-      xbps-install -S zfsbootmenu gummiboot-efistub
+      xbps-install -S zfsbootmenu systemd-boot-efistub
 
     .. include:: ../_include/configure-gen-zbm.rst
 

diff --git a/docs/man/generate-zbm.5.rst b/docs/man/generate-zbm.5.rst
@@ -120,7 +120,7 @@ EFI
 
 **Stub**
 
-  The path to the EFI stub loader used to boot the unified bundle. If not set, a default of ``/usr/lib/gummiboot/linuxx64.efi.stub`` is assumed.
+  The path to the EFI stub loader used to boot the unified bundle. If not set, a default of either ``/usr/lib/systemd/boot/efi/linuxx64.efi.stub`` or ``/usr/lib/gummiboot/linuxx64.efi.stub`` is assumed.
 
 EXAMPLE
 =======

diff --git a/releng/docker/Dockerfile b/releng/docker/Dockerfile
@@ -56,7 +56,7 @@ RUN --mount=type=cache,target=/var/cache/xbps <<-EOF
 	# Install ZFSBootMenu dependencies and components necessary to build images
 	zbm_deps="$(xbps-query -Rp run_depends zfsbootmenu)"
 	xbps-install -y ${KERNELS} ${kern_headers} ${zbm_deps} \
-		zstd gummiboot-efistub curl yq-go bash kbd \
+		zstd systemd-boot-efistub curl yq-go bash kbd \
 		dracut mkinitcpio dracut-network gptfdisk iproute2 iputils parted \
 		dosfstools e2fsprogs efibootmgr cryptsetup openssh util-linux kpartx
 

diff --git a/releng/docker/image-build.sh b/releng/docker/image-build.sh
@@ -182,7 +182,7 @@ buildah run "${host_mounts[@]}" "${container}" \
 
 buildah run "${host_mounts[@]}" "${container}" \
   xbps-install -y "${kern_series[@]}" "${kern_headers[@]}" \
-  git zstd gummiboot-efistub curl yq-go bash kbd \
+  git zstd systemd-boot-efistub curl yq-go bash kbd \
   dracut mkinitcpio dracut-network gptfdisk iproute2 iputils parted \
   curl dosfstools e2fsprogs efibootmgr cryptsetup openssh util-linux kpartx
 

diff --git a/testing/helpers/chroot-void.sh b/testing/helpers/chroot-void.sh
@@ -69,7 +69,7 @@ sed -i 's/^#PermitRootLogin.*/PermitRootLogin yes/' /etc/ssh/sshd_config
 # Pre-install zfsbootmenu
 if [ -x /root/zbm-populate.sh ]; then
   xbps-query -Rp run_depends zfsbootmenu | xargs xbps-install -y
-  xbps-install -y git gummiboot-efistub
+  xbps-install -y git systemd-boot-efistub
   SKIP_PERL=yes /root/zbm-populate.sh
   rm /root/zbm-populate.sh
 fi
diff --git a/testing/helpers/zbm-populate.sh b/testing/helpers/zbm-populate.sh
@@ -17,7 +17,7 @@ if [ -f /etc/zfsbootmenu/config.yaml ]; then
       -e '/BootMountPoint:/d' -i /etc/zfsbootmenu/config.yaml
 
   # Build the EFI executable if the stub is available
-  for stubdir in /usr/lib/gummiboot /usr/lib/systemd/boot/efi; do
+  for stubdir in /usr/lib/systemd/boot/efi /usr/lib/gummiboot; do
     [ -r "${stubdir}/linuxx64.efi.stub" ] || continue
     sed -e 's/Enabled:.*/Enabled: true/' -i /etc/zfsbootmenu/config.yaml
     break
-Original file line number
+Diff line change
@@ Expand Up / @@ -120,7 +120,7 @@ EFI @@
     **Stub**
-      The path to the EFI stub loader used to boot the unified bundle. If not set, a default of ``/usr/lib/gummiboot/linuxx64.efi.stub`` is assumed.
+      The path to the EFI stub loader used to boot the unified bundle. If not set, a default of either ``/usr/lib/systemd/boot/efi/linuxx64.efi.stub`` or ``/usr/lib/gummiboot/linuxx64.efi.stub`` is assumed.
     EXAMPLE
     =======
@@ Expand Down @@