From 721cc683c9d686f1f2886a732ff57ab5417c0889 Mon Sep 17 00:00:00 2001 From: Andrew Donnellan Date: Wed, 27 Oct 2021 15:45:50 +1100 Subject: tools/create-gce-image.sh: don't use a fixed root device path on ppc64le There's no need to hardcode the GRUB device path for the root device - that makes assumptions about how the partition firmware behaves. Just use GRUB's search command to determine it dynamically. Signed-off-by: Andrew Donnellan --- pkg/build/linux_generated.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkg/build/linux_generated.go') diff --git a/pkg/build/linux_generated.go b/pkg/build/linux_generated.go index 86ad3d65b..e48c534e1 100644 --- a/pkg/build/linux_generated.go +++ b/pkg/build/linux_generated.go @@ -145,7 +145,7 @@ menuentry 'linux' --class gnu-linux --class gnu --class os { insmod gzio insmod part_msdos insmod ext2 - set root='(ieee1275/disk,msdos2)' + search -f --set /vmlinuz linux /vmlinuz root=/dev/sda2 console=ttyS0 earlyprintk=serial oops=panic panic_on_warn=1 nmi_watchdog=panic panic=86400 net.ifnames=0 $CMDLINE } EOF -- cgit mrf-deployment