From 25b2d47f1ddff6c927f87a1d5eaff55d6882e824 Mon Sep 17 00:00:00 2001 From: Riyaz Faizullabhoy Date: Mon, 13 Feb 2017 10:16:46 -0800 Subject: [PATCH] Add page_poison=1 to boot args Signed-off-by: Riyaz Faizullabhoy --- alpine/cloud/aws/syslinux.cfg | 2 +- alpine/cloud/azure/syslinux.cfg | 2 +- base/mkimage-iso-efi/make-efi | 2 +- tools/mkimage-gce/make-gce | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/alpine/cloud/aws/syslinux.cfg b/alpine/cloud/aws/syslinux.cfg index fb284b205..944ecb431 100644 --- a/alpine/cloud/aws/syslinux.cfg +++ b/alpine/cloud/aws/syslinux.cfg @@ -4,4 +4,4 @@ PROMPT 0 LABEL linux KERNEL /vmlinuz64 INITRD /initrd.img - APPEND root=/dev/xvdb1 console=tty0 console=tty1 console=ttyS0 mobyplatform=aws vsyscall=emulate + APPEND root=/dev/xvdb1 console=tty0 console=tty1 console=ttyS0 mobyplatform=aws vsyscall=emulate page_poison=1 diff --git a/alpine/cloud/azure/syslinux.cfg b/alpine/cloud/azure/syslinux.cfg index 0dbb4297f..fd07dba79 100644 --- a/alpine/cloud/azure/syslinux.cfg +++ b/alpine/cloud/azure/syslinux.cfg @@ -2,4 +2,4 @@ DEFAULT linux LABEL linux KERNEL /vmlinuz64 INITRD /initrd.img - APPEND root=/dev/sda1 rootdelay=300 console=tty1 console=ttyS0 earlyprintk=ttyS0 mobyplatform=azure vsyscall=emulate + APPEND root=/dev/sda1 rootdelay=300 console=tty1 console=ttyS0 earlyprintk=ttyS0 mobyplatform=azure vsyscall=emulate page_poison=1 diff --git a/base/mkimage-iso-efi/make-efi b/base/mkimage-iso-efi/make-efi index 67e0e16c1..9284cdaa3 100755 --- a/base/mkimage-iso-efi/make-efi +++ b/base/mkimage-iso-efi/make-efi @@ -22,7 +22,7 @@ KERNEL="$(find . -name vmlinuz64 -or -name bzImage)" find . -mindepth 1 -maxdepth 1 -type d | xargs rm -rf # Docker for Windows specific options, should be moved -WINDOWS_OPTIONS="mobyplatform=windows vsyscall=emulate panic=1 rootdelay=300 noautodetect" +WINDOWS_OPTIONS="mobyplatform=windows vsyscall=emulate page_poison=1 panic=1 rootdelay=300 noautodetect" # Create a EFI boot file with kernel and initrd. From: # https://github.com/haraldh/mkrescue-uefi/blob/master/mkrescue-uefi.sh diff --git a/tools/mkimage-gce/make-gce b/tools/mkimage-gce/make-gce index 67ddec72c..09795e501 100755 --- a/tools/mkimage-gce/make-gce +++ b/tools/mkimage-gce/make-gce @@ -26,7 +26,7 @@ KERNEL="$(find . -name vmlinuz64 -or -name bzImage)" find . -mindepth 1 -maxdepth 1 -type d | xargs rm -rf # should be externally provided as GCE specific -GCE_CONFIG="earlyprintk=ttyS0,115200 console=ttyS0,115200 mobyplatform=gcp vsyscall=emulate" +GCE_CONFIG="earlyprintk=ttyS0,115200 console=ttyS0,115200 mobyplatform=gcp vsyscall=emulate page_poison=1" CFG="DEFAULT linux LABEL linux