tools/create-gce-image.sh: support s390x

Signed-off-by: Alexander Egorenkov <Alexander.Egorenkov@ibm.com>
This commit is contained in:
Alexander Egorenkov 2020-09-12 11:06:48 +02:00 committed by Dmitry Vyukov
parent dfb4c36914
commit df4f5a9c4a
2 changed files with 14 additions and 4 deletions

View File

@ -18,7 +18,7 @@ if [ ! -e $1/sbin/init ]; then
fi
case "$IMG_ARCH" in
386|amd64)
386|amd64|s390x)
KERNEL_IMAGE_BASENAME=bzImage
;;
ppc64le)
@ -66,7 +66,7 @@ elif [ "$BLOCK_DEVICE" == "nbd" ]; then
fi
case "$IMG_ARCH" in
386|amd64)
386|amd64|s390x)
echo -en "o\nn\np\n1\n\n\na\nw\n" | sudo fdisk $DISKDEV
PARTDEV=$DISKDEV"p1"
;;
@ -159,5 +159,10 @@ menuentry 'linux' --class gnu-linux --class gnu --class os {
EOF
sudo grub-install --target=powerpc-ieee1275 --boot-directory=disk.mnt/boot $DISKDEV"p1"
;;
s390x)
sudo zipl -V -t disk.mnt/boot -i disk.mnt/vmlinuz \
-P "root=/dev/vda1 console=ttyS0 earlyprintk=serial rodata=n oops=panic panic_on_warn=1 nmi_watchdog=panic panic=86400 net.ifnames=0 sysctl.kernel.hung_task_all_cpu_backtrace=1 net.ifnames=0 biosdevname=0 $CMDLINE" \
--targetbase=$DISKDEV --targettype=SCSI --targetblocksize=512 --targetoffset=2048
;;
esac
`

View File

@ -58,7 +58,7 @@ if [ ! -e $1/sbin/init ]; then
fi
case "$IMG_ARCH" in
386|amd64)
386|amd64|s390x)
KERNEL_IMAGE_BASENAME=bzImage
;;
ppc64le)
@ -114,7 +114,7 @@ elif [ "$BLOCK_DEVICE" == "nbd" ]; then
fi
case "$IMG_ARCH" in
386|amd64)
386|amd64|s390x)
echo -en "o\nn\np\n1\n\n\na\nw\n" | sudo fdisk $DISKDEV
PARTDEV=$DISKDEV"p1"
;;
@ -220,4 +220,9 @@ menuentry 'linux' --class gnu-linux --class gnu --class os {
EOF
sudo grub-install --target=powerpc-ieee1275 --boot-directory=disk.mnt/boot $DISKDEV"p1"
;;
s390x)
sudo zipl -V -t disk.mnt/boot -i disk.mnt/vmlinuz \
-P "root=/dev/vda1 console=ttyS0 earlyprintk=serial rodata=n oops=panic panic_on_warn=1 nmi_watchdog=panic panic=86400 net.ifnames=0 sysctl.kernel.hung_task_all_cpu_backtrace=1 net.ifnames=0 biosdevname=0 $CMDLINE" \
--targetbase=$DISKDEV --targettype=SCSI --targetblocksize=512 --targetoffset=2048
;;
esac