From 83184edaa911a122f2a53286c45181ecc364fef8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E7=82=9C?= Date: Fri, 3 Nov 2023 18:19:54 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8Dopenkylin=20grub2=202.12,=20?= =?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8linuxefi=E6=A8=A1=E5=9D=97=E6=97=B6?= =?UTF-8?q?=E5=B0=B1=E4=B8=8D=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 6 ++++++ scripts/build/lb_binary_grub2-efi | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index fd21034..6ec008b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +live-build (3.0~a57-ok5) nile; urgency=medium + + * 适配openkylin grub2 2.12, 不存在linuxefi模块时就不添加 + + -- Xie Wei Fri, 03 Nov 2023 18:18:43 +0800 + live-build (3.0~a57-ok4) nile; urgency=medium * add depends dpkg-dev, apt-utils diff --git a/scripts/build/lb_binary_grub2-efi b/scripts/build/lb_binary_grub2-efi index 63ecfe4..3d3c454 100755 --- a/scripts/build/lb_binary_grub2-efi +++ b/scripts/build/lb_binary_grub2-efi @@ -327,7 +327,10 @@ if [ -d chroot/usr/lib/grub/x86_64-efi ];then KY_EFI_NAME="x86_64-efi" KY_BOOT_EFI_NAME="BOOTX64.EFI" KY_GRUB_EFI_NAME="grubx64.efi" - GRUB_MODS="${GRUB_MODS} linuxefi" + if [ -f /usr/lib/grub/x86_64-efi/linuxefi.mod ] + then + GRUB_MODS="${GRUB_MODS} linuxefi" + fi elif [ -d chroot/usr/lib/grub/arm64-efi ];then KY_EFI="/usr/lib/grub/arm64-efi" KY_EFI_NAME="arm64-efi"