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