From c01acf6c4d01efba2000ca7fe4627eec763a63cc Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Thu, 17 Jun 2021 18:32:23 +0800 Subject: [PATCH] x86: sync upstream grub config Signed-off-by: Tianling Shen --- target/linux/x86/image/grub-iso.cfg | 9 +++++++-- target/linux/x86/image/grub.cfg | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/target/linux/x86/image/grub-iso.cfg b/target/linux/x86/image/grub-iso.cfg index 9c59bdf6d4..4bef492a41 100644 --- a/target/linux/x86/image/grub-iso.cfg +++ b/target/linux/x86/image/grub-iso.cfg @@ -3,8 +3,13 @@ set default="0" set timeout="@TIMEOUT@" -set root='(cd)' + +if [ "${grub_platform}" = "efi" ]; then + set root='(cd0)' +else + set root='(cd)' +fi menuentry "@TITLE@" { - linux /boot/vmlinuz @CMDLINE@ noinitrd + linux /boot/vmlinuz root=/dev/sr0 rootfstype=iso9660 rootwait @CMDLINE@ noinitrd } diff --git a/target/linux/x86/image/grub.cfg b/target/linux/x86/image/grub.cfg index dedfa0a636..75605bcabf 100644 --- a/target/linux/x86/image/grub.cfg +++ b/target/linux/x86/image/grub.cfg @@ -3,11 +3,11 @@ set default="0" set timeout="@TIMEOUT@" -set root='(@ROOT@)' +set root='(hd0,msdos1)' menuentry "@TITLE@" { - linux /boot/vmlinuz @CMDLINE@ noinitrd + linux /boot/vmlinuz @ROOTPART@ @CMDLINE@ noinitrd } menuentry "@TITLE@ (failsafe)" { - linux /boot/vmlinuz failsafe=true @CMDLINE@ noinitrd + linux /boot/vmlinuz failsafe=true @ROOTPART@ @CMDLINE@ noinitrd }