From 6db87549c454445eebe2ad3973aca1c5b019590f Mon Sep 17 00:00:00 2001 From: Riyaz Faizullabhoy Date: Mon, 5 Dec 2016 10:11:52 -0800 Subject: [PATCH] Set CONFIG_LEGACY_VSYSCALL to NONE and vsyscall=emulate Regenerated the kernel config from container, which bumped the kernel version and included some other fixes. Also bumps the check-config container to check for VSYSCALL_NATIVE Signed-off-by: Riyaz Faizullabhoy --- alpine/Dockerfile.efi | 2 +- alpine/cloud/aws/syslinux.cfg | 2 +- alpine/cloud/azure/syslinux.cfg | 2 +- alpine/kernel/kernel_config | 14 +++++--------- alpine/packages/test/usr/bin/mobytest | 2 +- 5 files changed, 9 insertions(+), 13 deletions(-) diff --git a/alpine/Dockerfile.efi b/alpine/Dockerfile.efi index 5672fd2c7..b8eb1ad30 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 rootdelay=300 noautodetect" > cmdline.txt && \ + echo "earlyprintk=ttyS0,115200 console=ttyS0,115200 mobyplatform=windows vsyscall=emulate 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 \ diff --git a/alpine/cloud/aws/syslinux.cfg b/alpine/cloud/aws/syslinux.cfg index 0fe72b9cc..fb284b205 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 + APPEND root=/dev/xvdb1 console=tty0 console=tty1 console=ttyS0 mobyplatform=aws vsyscall=emulate diff --git a/alpine/cloud/azure/syslinux.cfg b/alpine/cloud/azure/syslinux.cfg index 95e4cd451..0dbb4297f 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 + APPEND root=/dev/sda1 rootdelay=300 console=tty1 console=ttyS0 earlyprintk=ttyS0 mobyplatform=azure vsyscall=emulate diff --git a/alpine/kernel/kernel_config b/alpine/kernel/kernel_config index 00189eac2..9ccbb57e7 100644 --- a/alpine/kernel/kernel_config +++ b/alpine/kernel/kernel_config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.8.8 Kernel Configuration +# Linux/x86 4.8.12 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -238,7 +238,6 @@ CONFIG_SLAB=y # CONFIG_SYSTEM_DATA_VERIFICATION is not set CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y -CONFIG_KEXEC_CORE=n CONFIG_OPROFILE=y # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set CONFIG_HAVE_OPROFILE=y @@ -552,9 +551,8 @@ CONFIG_HZ_100=y # CONFIG_HZ_1000 is not set CONFIG_HZ=100 CONFIG_SCHED_HRTICK=y -CONFIG_KEXEC=n -CONFIG_KEXEC_FILE=n -# CONFIG_KEXEC_VERIFY_SIG is not set +# CONFIG_KEXEC is not set +# CONFIG_KEXEC_FILE is not set # CONFIG_CRASH_DUMP is not set CONFIG_PHYSICAL_START=0x1000000 CONFIG_RELOCATABLE=y @@ -565,8 +563,8 @@ CONFIG_HOTPLUG_CPU=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_COMPAT_VDSO is not set # CONFIG_LEGACY_VSYSCALL_NATIVE is not set -CONFIG_LEGACY_VSYSCALL_EMULATE=y -# CONFIG_LEGACY_VSYSCALL_NONE is not set +# CONFIG_LEGACY_VSYSCALL_EMULATE is not set +CONFIG_LEGACY_VSYSCALL_NONE=y # CONFIG_CMDLINE_BOOL is not set CONFIG_MODIFY_LDT_SYSCALL=y CONFIG_HAVE_LIVEPATCH=y @@ -2809,7 +2807,6 @@ CONFIG_EFI_VARS=y CONFIG_EFI_ESRT=y CONFIG_EFI_VARS_PSTORE=y # CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set -CONFIG_EFI_RUNTIME_MAP=y # CONFIG_EFI_FAKE_MEMMAP is not set CONFIG_EFI_RUNTIME_WRAPPERS=y # CONFIG_EFI_BOOTLOADER_CONTROL is not set @@ -3587,7 +3584,6 @@ CONFIG_ASSOCIATIVE_ARRAY=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y CONFIG_HAS_DMA=y -CONFIG_CPUMASK_OFFSTACK=y CONFIG_CPU_RMAP=y CONFIG_DQL=y CONFIG_GLOB=y diff --git a/alpine/packages/test/usr/bin/mobytest b/alpine/packages/test/usr/bin/mobytest index 86814dbcf..95cc8a717 100755 --- a/alpine/packages/test/usr/bin/mobytest +++ b/alpine/packages/test/usr/bin/mobytest @@ -16,4 +16,4 @@ wget -O - -q localhost/hostname docker kill webserver docker rm webserver docker swarm init -docker run mobylinux/check-config:d57f9829e3f862acc0f7c8421bd8579650287fb6 +docker run mobylinux/check-config:bc2b57a0770129c75a6676ae0c944ece1d50cc3f