From 2c76a8260a6cae1f2331b231a8d49fa276b5e5ce Mon Sep 17 00:00:00 2001 From: Andrew Donnellan Date: Mon, 25 Oct 2021 17:02:53 +1100 Subject: tools/create-gce-image.sh: use DOS MBR instead of GPT for ppc64le images Some versions of PowerVM Partition Firmware have trouble handling GPT partition tables on boot devices. Use MBR partition tables to avoid compatibility issues. Signed-off-by: Andrew Donnellan --- pkg/build/linux_generated.go | 6 +++--- tools/create-gce-image.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/build/linux_generated.go b/pkg/build/linux_generated.go index f8922e410..86ad3d65b 100644 --- a/pkg/build/linux_generated.go +++ b/pkg/build/linux_generated.go @@ -61,7 +61,7 @@ case "$IMG_ARCH" in PARTDEV=$DISKDEV"p1" ;; ppc64le) - echo -en "g\nn\n1\n2048\n16383\nt\n7\nn\n2\n\n\nw\n" | sudo fdisk $DISKDEV + echo -en "o\nn\np\n1\n2048\n16383\na\nt\n41\nn\np\n2\n\n\nw\n" | sudo fdisk $DISKDEV PARTDEV=$DISKDEV"p2" ;; esac @@ -143,9 +143,9 @@ terminal_output console set timeout=0 menuentry 'linux' --class gnu-linux --class gnu --class os { insmod gzio - insmod part_gpt + insmod part_msdos insmod ext2 - set root='(ieee1275/disk,gpt2)' + set root='(ieee1275/disk,msdos2)' 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 diff --git a/tools/create-gce-image.sh b/tools/create-gce-image.sh index 54db2edcd..b1311db9d 100755 --- a/tools/create-gce-image.sh +++ b/tools/create-gce-image.sh @@ -99,7 +99,7 @@ case "$IMG_ARCH" in ;; ppc64le) # Create a small PowerPC PReP boot partition, and a Linux partition for the rest - echo -en "g\nn\n1\n2048\n16383\nt\n7\nn\n2\n\n\nw\n" | sudo fdisk $DISKDEV + echo -en "o\nn\np\n1\n2048\n16383\na\nt\n41\nn\np\n2\n\n\nw\n" | sudo fdisk $DISKDEV PARTDEV=$DISKDEV"p2" ;; esac @@ -193,9 +193,9 @@ set timeout=0 # debug is not set as it produces too much output menuentry 'linux' --class gnu-linux --class gnu --class os { insmod gzio - insmod part_gpt + insmod part_msdos insmod ext2 - set root='(ieee1275/disk,gpt2)' + set root='(ieee1275/disk,msdos2)' 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