From c5c77b2ecc0949d1084943cecb5027696ccf39ae Mon Sep 17 00:00:00 2001
From: bin456789 <bin456789@gmail.com>
Date: Sun, 3 May 2026 23:08:03 +0800
Subject: [PATCH] =?UTF-8?q?core:=20efibootmgr=20=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E6=97=B6=E6=98=BE=E7=A4=BA=E6=89=A7=E8=A1=8C=E7=9A=84=E5=91=BD?=
 =?UTF-8?q?=E4=BB=A4=E5=92=8C=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 reinstall.sh | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/reinstall.sh b/reinstall.sh
index e9d87e1..22a631e 100644
--- a/reinstall.sh
+++ b/reinstall.sh
@@ -2881,18 +2881,20 @@ add_efi_entry_in_linux() {
         dev_part=$(findmnt -T "$dist_dir" -no SOURCE | grep '^/dev/')
     fi
 
-    if ! {
-        res=$(efibootmgr --create-only \
-            --disk "/dev/$(get_disk_by_part $dev_part)" \
-            --part "$(get_part_num_by_part $dev_part)" \
-            --label "$(get_entry_name)" \
-            --loader "\\EFI\\reinstall\\$basename") &&
-            id=$(echo "$res" | grep_efi_entry | tail -1 | grep_efi_index | grep .) &&
-            efibootmgr --bootnext "$id"
-    }; then
+    set -- efibootmgr --create-only \
+        --disk "/dev/$(get_disk_by_part $dev_part)" \
+        --part "$(get_part_num_by_part $dev_part)" \
+        --label "$(get_entry_name)" \
+        --loader "\\EFI\\reinstall\\$basename"
+
+    if ! res=$("$@"); then
+        echo "Command: $*"
         echo "$res"
         error_and_exit "Could not add efi entry."
     fi
+
+    id=$(echo "$res" | grep_efi_entry | tail -1 | grep_efi_index | grep .)
+    efibootmgr --bootnext "$id"
 }
 
 get_grub_efi_filename() {