diff options
| -rw-r--r-- | pkg/build/linux_generated.go | 9 | ||||
| -rwxr-xr-x | tools/create-gce-image.sh | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/pkg/build/linux_generated.go b/pkg/build/linux_generated.go index fb426e60f..56c670ce6 100644 --- a/pkg/build/linux_generated.go +++ b/pkg/build/linux_generated.go @@ -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 ` diff --git a/tools/create-gce-image.sh b/tools/create-gce-image.sh index 80be8686a..aad89e586 100755 --- a/tools/create-gce-image.sh +++ b/tools/create-gce-image.sh @@ -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 |