Skip to contentSkip to conversation

board/pc: drop unused grub-efi.cfg file

PATCH New Thomas Petazzoni 2 participants 3 messages May 10, 2019 – May 26, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 board/pc: drop unused grub-efi.cfg file

Following commit fee29b05bb7db25e37c8a5175ce00dc712554edf ("configs/pc_x86_64_efi: use a GPT partition table"), board/pc/grub-efi.cfg is no longer used anywhere: the post-image-efi-gpt.sh script generates the grub configuration.

Also, since post-image-efi-gpt.sh generates a grub configuration file that uses the root filesystem partition UUID as the root= kernel argument, the instructions in the readme.txt file to tweak root= from /dev/sda2 to /dev/vda2 is no longer relevant. This was noted in the commit log of fee29b05bb7db25e37c8a5175ce00dc712554edf:

The root filesystem location is passed to the kernel by a partition UUID, so it is possible to boot on QEMU, directly from the disk image, or dump the image to a physical device.

Fixes #11841
Cc Pete Morici <[email protected]>
Cc Carlos A. M. dos Santos <[email protected]>
---
 board/pc/grub-efi.cfg | 6 ------
 board/pc/readme.txt   | 8 +-------
 2 files changed, 1 insertion(+), 13 deletions(-)
 delete mode 100644 board/pc/grub-efi.cfg
board/pc/grub-efi.cfg deleted +0 -6
deleted file mode 100644
index 222301a4e0..0000000000
@@ -1,6 +0,0 @@
-set default="0"
-set timeout="5"
-
-menuentry "Buildroot" {
-	linux /bzImage root=/dev/sda2 rootwait console=tty1
-}
board/pc/readme.txt +1 -7
index 895331b0af..41aec50d36 100644
@@ -57,13 +57,7 @@ qemu-system-x86_64 \
 Emulation in qemu (UEFI)
 ========================
 
-1. Edit grub-efi.cfg
-
-  Since the driver will show up in the virtual machine as /dev/vda,
-  change board/pc/grub-efi.cfg to use root=/dev/vda2 instead of
-  root=/dev/sda2. Then rebuild grub2 and the image.
-
-2. Run the emulation with:
+Run the emulation with:
 
 qemu-system-x86_64 \
 	-M pc \
Signature · 1 line
2.21.0
#1 lore raw

PATCH 1/1 board/pc: drop unused grub-efi.cfg file

Quoted 13 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Following commit fee29b05bb7db25e37c8a5175ce00dc712554edf ("configs/pc_x86_64_efi: use a GPT partition table"), board/pc/grub-efi.cfg is no longer used anywhere: the post-image-efi-gpt.sh script generates the grub configuration.

Also, since post-image-efi-gpt.sh generates a grub configuration file that uses the root filesystem partition UUID as the root= kernel argument, the instructions in the readme.txt file to tweak root= from /dev/sda2 to /dev/vda2 is no longer relevant. This was noted in the commit log of fee29b05bb7db25e37c8a5175ce00dc712554edf:

Quoted 8 lines

The root filesystem location is passed to the kernel by a partition UUID, so it is possible to boot on QEMU, directly from the disk image, or dump the image to a physical device.

Fixes #11841
Cc Pete Morici <[email protected]>
Cc Carlos A. M. dos Santos <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 board/pc: drop unused grub-efi.cfg file

In reply to Thomas Petazzoni
Quoted 13 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Following commit fee29b05bb7db25e37c8a5175ce00dc712554edf ("configs/pc_x86_64_efi: use a GPT partition table"), board/pc/grub-efi.cfg is no longer used anywhere: the post-image-efi-gpt.sh script generates the grub configuration.

Also, since post-image-efi-gpt.sh generates a grub configuration file that uses the root filesystem partition UUID as the root= kernel argument, the instructions in the readme.txt file to tweak root= from /dev/sda2 to /dev/vda2 is no longer relevant. This was noted in the commit log of fee29b05bb7db25e37c8a5175ce00dc712554edf:

Quoted 8 lines

The root filesystem location is passed to the kernel by a partition UUID, so it is possible to boot on QEMU, directly from the disk image, or dump the image to a physical device.

Fixes #11841
Cc Pete Morici <[email protected]>
Cc Carlos A. M. dos Santos <[email protected]>

Committed to 2019.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard