github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-22 18:41:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1081 from riyazdf/panic

Browse Source 
Do not reboot on panic, except for desktop editions
This commit is contained in:
Justin Cormack 2017-01-24 12:09:20 +00:00 committed by GitHub
commit c565c75a85
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
alpine/Dockerfile.efi
View File

@ -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 \

4
alpine/kernel/kernel_config
View File

@ -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