From bb9a9f1050fbda4bffb57696fde1a7f473b8d3ad Mon Sep 17 00:00:00 2001 From: Riyaz Faizullabhoy Date: Mon, 23 Jan 2017 10:44:06 -0800 Subject: [PATCH 1/2] Set panic=1 for docker 4 win Signed-off-by: Riyaz Faizullabhoy --- alpine/Dockerfile.efi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/Dockerfile.efi b/alpine/Dockerfile.efi index af422ae86..1ddd76b44 100644 --- a/alpine/Dockerfile.efi +++ b/alpine/Dockerfile.efi @@ -10,7 +10,7 @@ COPY kernel/x86_64/vmlinuz64 ./ # Create a EFI boot file with kernel and initrd. From: # https://github.com/haraldh/mkrescue-uefi/blob/master/mkrescue-uefi.sh RUN cp /usr/lib/gummiboot/linuxx64.efi.stub . && \ - echo "earlyprintk=ttyS0,115200 console=ttyS0,115200 mobyplatform=windows vsyscall=emulate rootdelay=300 noautodetect" > cmdline.txt && \ + echo "earlyprintk=ttyS0,115200 console=ttyS0,115200 mobyplatform=windows vsyscall=emulate panic=1 rootdelay=300 noautodetect" > cmdline.txt && \ objcopy \ --add-section .osrel=/etc/os-release --change-section-vma .osrel=0x20000 \ --add-section .cmdline=./cmdline.txt --change-section-vma .cmdline=0x30000 \ From c37e0c592fc9a6a35f6202e238fdffbb428750ef Mon Sep 17 00:00:00 2001 From: Riyaz Faizullabhoy Date: Mon, 23 Jan 2017 10:58:58 -0800 Subject: [PATCH 2/2] Set CONFIG_PANIC_TIMEOUT=0 in kernel config Signed-off-by: Riyaz Faizullabhoy --- alpine/kernel/kernel_config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alpine/kernel/kernel_config b/alpine/kernel/kernel_config index 18faf407a..5dd9fab37 100644 --- a/alpine/kernel/kernel_config +++ b/alpine/kernel/kernel_config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.9.4 Kernel Configuration +# Linux/x86 4.9.5 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -3164,7 +3164,7 @@ CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 CONFIG_WQ_WATCHDOG=y CONFIG_PANIC_ON_OOPS=y CONFIG_PANIC_ON_OOPS_VALUE=1 -CONFIG_PANIC_TIMEOUT=1 +CONFIG_PANIC_TIMEOUT=0 CONFIG_SCHED_DEBUG=y CONFIG_SCHED_INFO=y # CONFIG_SCHEDSTATS is not set