github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-27 04:28:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #849 from riyazdf/kexec-kernel-config

Browse Source 
Disable kexec from kernel_config
This commit is contained in:
Justin Cormack 2016-12-07 13:55:42 -08:00 committed by GitHub
commit d826f22f95
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
alpine/etc/sysctl.d/01-moby.conf
View File

@ -7,5 +7,4 @@ net.ipv4.neigh.default.gc_thresh3 = 32768
fs.aio-max-nr = 1048576 fs.aio-max-nr = 1048576
fs.inotify.max_user_watches = 524288 fs.inotify.max_user_watches = 524288
fs.file-max = 524288 fs.file-max = 524288
kernel.random.write_wakeup_threshold = 3072 kernel.random.write_wakeup_threshold = 3072
kernel.kexec_load_disabled = 1

6
alpine/kernel/kernel_config
View File

@ -238,7 +238,7 @@ CONFIG_SLAB=y
# CONFIG_SYSTEM_DATA_VERIFICATION is not set # CONFIG_SYSTEM_DATA_VERIFICATION is not set
CONFIG_PROFILING=y CONFIG_PROFILING=y
CONFIG_TRACEPOINTS=y CONFIG_TRACEPOINTS=y
CONFIG_KEXEC_CORE=y CONFIG_KEXEC_CORE=n
CONFIG_OPROFILE=y CONFIG_OPROFILE=y
# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
CONFIG_HAVE_OPROFILE=y CONFIG_HAVE_OPROFILE=y
@ -552,8 +552,8 @@ CONFIG_HZ_100=y
# CONFIG_HZ_1000 is not set # CONFIG_HZ_1000 is not set
CONFIG_HZ=100 CONFIG_HZ=100
CONFIG_SCHED_HRTICK=y CONFIG_SCHED_HRTICK=y
CONFIG_KEXEC=y CONFIG_KEXEC=n
CONFIG_KEXEC_FILE=y CONFIG_KEXEC_FILE=n
# CONFIG_KEXEC_VERIFY_SIG is not set # CONFIG_KEXEC_VERIFY_SIG is not set
# CONFIG_CRASH_DUMP is not set # CONFIG_CRASH_DUMP is not set
CONFIG_PHYSICAL_START=0x1000000 CONFIG_PHYSICAL_START=0x1000000