Skip to content

Commit

Permalink
Revert "grub: x86 efi add search module for better find boot partitio…
Browse files Browse the repository at this point in the history
…n on multiple disk"

This reverts commit 8b97425.
  • Loading branch information
Beginner-Go committed Feb 26, 2022
1 parent 77251e9 commit a61a597
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions package/boot/grub2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -105,28 +105,28 @@ define Package/grub2/install
-O i386-pc \
-c $(PKG_BUILD_DIR)/grub-early.cfg \
-o $(STAGING_DIR_IMAGE)/grub2/gpt-core.img \
at_keyboard biosdisk boot chain configfile fat linux ls part_gpt reboot serial vga search
at_keyboard biosdisk boot chain configfile fat linux ls part_gpt reboot serial vga
$(STAGING_DIR_HOST)/bin/grub-mkimage \
-d $(PKG_BUILD_DIR)/grub-core \
-p /boot/grub \
-O i386-pc \
-c ./files/grub-early.cfg \
-o $(STAGING_DIR_IMAGE)/grub2/generic-core.img \
at_keyboard biosdisk boot chain configfile ext2 linux ls part_msdos reboot serial vga search
at_keyboard biosdisk boot chain configfile ext2 linux ls part_msdos reboot serial vga
$(STAGING_DIR_HOST)/bin/grub-mkimage \
-d $(PKG_BUILD_DIR)/grub-core \
-p /boot/grub \
-O i386-pc \
-c ./files/grub-early.cfg \
-o $(STAGING_DIR_IMAGE)/grub2/eltorito.img \
at_keyboard biosdisk boot chain configfile iso9660 linux ls part_msdos reboot serial test vga search
at_keyboard biosdisk boot chain configfile iso9660 linux ls part_msdos reboot serial test vga
$(STAGING_DIR_HOST)/bin/grub-mkimage \
-d $(PKG_BUILD_DIR)/grub-core \
-p /boot/grub \
-O i386-pc \
-c ./files/grub-early.cfg \
-o $(STAGING_DIR_IMAGE)/grub2/legacy-core.img \
biosdisk boot chain configfile ext2 linux ls part_msdos reboot serial vga search
biosdisk boot chain configfile ext2 linux ls part_msdos reboot serial vga
endef

define Package/grub2-efi/install
Expand Down
2 changes: 1 addition & 1 deletion target/linux/x86/image/grub-efi.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

set default="0"
set timeout="@TIMEOUT@"
search -l kernel -s root
set root='(hd0,gpt1)'

menuentry "@TITLE@" {
linux /boot/vmlinuz @GPT_ROOTPART@ @CMDLINE@ noinitrd
Expand Down

0 comments on commit a61a597

Please sign in to comment.