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

Merge pull request #841 from riyazdf/vsyscall-emulate

Browse Source 
Set CONFIG_LEGACY_VSYSCALL to NONE
This commit is contained in:
Justin Cormack 2016-12-09 13:27:15 -08:00 committed by GitHub
commit 0b7dc8196e
5 changed files with 9 additions and 13 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: # Create a EFI boot file with kernel and initrd. From:
# https://github.com/haraldh/mkrescue-uefi/blob/master/mkrescue-uefi.sh # https://github.com/haraldh/mkrescue-uefi/blob/master/mkrescue-uefi.sh
RUN cp /usr/lib/gummiboot/linuxx64.efi.stub . && \ 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 \ objcopy \
--add-section .osrel=/etc/os-release --change-section-vma .osrel=0x20000 \ --add-section .osrel=/etc/os-release --change-section-vma .osrel=0x20000 \
--add-section .cmdline=./cmdline.txt --change-section-vma .cmdline=0x30000 \ --add-section .cmdline=./cmdline.txt --change-section-vma .cmdline=0x30000 \

2
alpine/cloud/aws/syslinux.cfg
View File

@ -4,4 +4,4 @@ PROMPT 0
LABEL linux LABEL linux
KERNEL /vmlinuz64 KERNEL /vmlinuz64
INITRD /initrd.img 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

2
alpine/cloud/azure/syslinux.cfg
View File

@ -2,4 +2,4 @@ DEFAULT linux
LABEL linux LABEL linux
KERNEL /vmlinuz64 KERNEL /vmlinuz64
INITRD /initrd.img 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

14
alpine/kernel/kernel_config
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/x86 4.8.8 Kernel Configuration # Linux/x86 4.8.12 Kernel Configuration
# #
CONFIG_64BIT=y CONFIG_64BIT=y
CONFIG_X86_64=y CONFIG_X86_64=y
@ -238,7 +238,6 @@ 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=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,9 +551,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=n # CONFIG_KEXEC is not set
CONFIG_KEXEC_FILE=n # CONFIG_KEXEC_FILE 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
CONFIG_RELOCATABLE=y CONFIG_RELOCATABLE=y
@ -565,8 +563,8 @@ CONFIG_HOTPLUG_CPU=y
# CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
# CONFIG_COMPAT_VDSO is not set # CONFIG_COMPAT_VDSO is not set
# CONFIG_LEGACY_VSYSCALL_NATIVE is not set # CONFIG_LEGACY_VSYSCALL_NATIVE is not set
CONFIG_LEGACY_VSYSCALL_EMULATE=y # CONFIG_LEGACY_VSYSCALL_EMULATE is not set
# CONFIG_LEGACY_VSYSCALL_NONE is not set CONFIG_LEGACY_VSYSCALL_NONE=y
# CONFIG_CMDLINE_BOOL is not set # CONFIG_CMDLINE_BOOL is not set
CONFIG_MODIFY_LDT_SYSCALL=y CONFIG_MODIFY_LDT_SYSCALL=y
CONFIG_HAVE_LIVEPATCH=y CONFIG_HAVE_LIVEPATCH=y
@ -2809,7 +2807,6 @@ CONFIG_EFI_VARS=y
CONFIG_EFI_ESRT=y CONFIG_EFI_ESRT=y
CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI_VARS_PSTORE=y
# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set # CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
CONFIG_EFI_RUNTIME_MAP=y
# CONFIG_EFI_FAKE_MEMMAP is not set # CONFIG_EFI_FAKE_MEMMAP is not set
CONFIG_EFI_RUNTIME_WRAPPERS=y CONFIG_EFI_RUNTIME_WRAPPERS=y
# CONFIG_EFI_BOOTLOADER_CONTROL is not set # CONFIG_EFI_BOOTLOADER_CONTROL is not set
@ -3587,7 +3584,6 @@ CONFIG_ASSOCIATIVE_ARRAY=y
CONFIG_HAS_IOMEM=y CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT_MAP=y CONFIG_HAS_IOPORT_MAP=y
CONFIG_HAS_DMA=y CONFIG_HAS_DMA=y
CONFIG_CPUMASK_OFFSTACK=y
CONFIG_CPU_RMAP=y CONFIG_CPU_RMAP=y
CONFIG_DQL=y CONFIG_DQL=y
CONFIG_GLOB=y CONFIG_GLOB=y

2
alpine/packages/test/usr/bin/mobytest
View File

@ -16,4 +16,4 @@ wget -O - -q localhost/hostname
docker kill webserver docker kill webserver
docker rm webserver docker rm webserver
docker swarm init docker swarm init
docker run mobylinux/check-config:d57f9829e3f862acc0f7c8421bd8579650287fb6 docker run mobylinux/check-config:bc2b57a0770129c75a6676ae0c944ece1d50cc3f