From 7def0a79dc38a9d49d81eae27cee76e0cbc415b8 Mon Sep 17 00:00:00 2001 From: maideii Date: Thu, 12 Oct 2017 08:40:08 +0800 Subject: [PATCH] added EFI 32bit support via GRUB2-updated busybox init config --- packages/sysutils/busybox/scripts/init | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init index fa870e2a87..3ccc261ea1 100755 --- a/packages/sysutils/busybox/scripts/init +++ b/packages/sysutils/busybox/scripts/init @@ -156,10 +156,10 @@ ;; grub_live) LIVE=yes - GRUB_DEFAULT="\"Live\"" + GRUB_DEFAULT="Live" ;; grub_portable) - GRUB_DEFAULT="\"Run\"" + GRUB_DEFAULT="Run" ;; overlay) OVERLAY=yes @@ -708,7 +708,7 @@ } # Make last bootloader label (installer, live, run etc.) as the new default - update_syslinux() { + update_bootmenu() { local crnt_default if [ -n "$SYSLINUX_DEFAULT" -a -f /flash/syslinux.cfg ]; then @@ -725,14 +725,14 @@ fi fi - if [ -n "$GRUB_DEFAULT" -a -f /flash/grub.cfg ]; then - if grep -q "^menuentry $GRUB_DEFAULT" /flash/grub.cfg; then + if [ -n "\"$GRUB_DEFAULT\"" -a -f /flash/grub.cfg ]; then + if grep -q "^menuentry \"$GRUB_DEFAULT\"" /flash/grub.cfg; then crnt_default="$(awk '/^set default/ {print substr($2,9,19)}' /flash/grub.cfg)" - if [ ! "$crnt_default" = "$GRUB_DEFAULT" ]; then - progress "Updating /flash/grub.cfg [$crnt_default -> $GRUB_DEFAULT]" + if [ ! "$crnt_default" = "\"$GRUB_DEFAULT\"" ]; then + progress "Updating /flash/grub.cfg [$crnt_default -> \"$GRUB_DEFAULT\"]" mount -o remount,rw /flash - sed -i "s/^set default=.*/set default=$GRUB_DEFAULT/" /flash/grub.cfg + sed -i "s/^set default=.*/set default=\"$GRUB_DEFAULT\"/" /flash/grub.cfg [ -f /flash/EFI/BOOT/grub.cfg ] && cp /flash/grub.cfg /flash/EFI/BOOT/grub.cfg mount -o remount,ro /flash fi @@ -1060,7 +1060,7 @@ load_modules \ check_disks \ mount_flash \ - update_syslinux \ + update_bootmenu \ load_splash \ mount_storage \ check_update \