diff options
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/x86/base-files/lib/upgrade/platform.sh | 10 | ||||
| -rw-r--r-- | target/linux/x86/image/grub-efi.cfg | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh index 94bf80b144..d8f2eba97e 100644 --- a/target/linux/x86/base-files/lib/upgrade/platform.sh +++ b/target/linux/x86/base-files/lib/upgrade/platform.sh @@ -65,16 +65,6 @@ platform_do_bootloader_upgrade() { "/dev/$diskdev" \ && touch /tmp/boot/boot/grub/upgraded - case "$(board_name)" in - cisco-mx100-hw) - # If the MX100 is booted UEFI AND the SATA HDD exists, we need to change - # grub's root= to hd1 for it to boot correctly, otherwise we can keep it hd0. - if [ -d /sys/firmware/efi ] && [ "$(ls -a /dev/sd[a-z] | wc -w)" -gt 1 ] ; then - sed -i "s|hd0,${parttable}1|hd1,${parttable}1|g" /tmp/boot/boot/grub/grub.cfg - fi - ;; - esac - umount /tmp/boot fi } diff --git a/target/linux/x86/image/grub-efi.cfg b/target/linux/x86/image/grub-efi.cfg index 14d30e88e4..bbb31f7747 100644 --- a/target/linux/x86/image/grub-efi.cfg +++ b/target/linux/x86/image/grub-efi.cfg @@ -3,7 +3,7 @@ set default="0" set timeout="@TIMEOUT@" -set root='(hd0,gpt1)' +search -l kernel -s root menuentry "@TITLE@" { linux /boot/vmlinuz @GPT_ROOTPART@ @CMDLINE@ noinitrd |