From a051483c79229a1cbb64f6b0ba8c058d60c18aab Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Mon, 1 Apr 2024 14:43:16 -0400 Subject: [PATCH 1/2] linux configs: align with purism; remove TMPFS, add sysctl requirements Signed-off-by: Thierry Laurion --- config/linux-c216.config | 10 +++------- config/linux-kgpe-d16_server-whiptail.config | 10 ++++------ config/linux-kgpe-d16_server.config | 10 ++++------ config/linux-kgpe-d16_workstation.config | 10 ++++------ config/linux-librem_common-6.1.8.config | 3 ++- config/linux-librem_common.config | 3 ++- config/linux-linuxboot.config | 4 ++-- config/linux-nitropad-x.config | 17 +++++++---------- config/linux-qemu.config | 11 ++++------- config/linux-t440p.config | 10 +++------- config/linux-talos-2.config | 7 +------ config/linux-w541.config | 10 +++------- config/linux-x230-flash.config | 7 +------ config/linux-x230-legacy.config | 7 +------ config/linux-x230-maximized.config | 10 +++------- 15 files changed, 44 insertions(+), 85 deletions(-) diff --git a/config/linux-c216.config b/config/linux-c216.config index 252a7a65f..dbd963eac 100644 --- a/config/linux-c216.config +++ b/config/linux-c216.config @@ -157,6 +157,7 @@ CONFIG_INITRAMFS_COMPRESSION_XZ=y # CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_LD_ORPHAN_WARN=y +CONFIG_SYSCTL=y CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_HAVE_PCSPKR_PLATFORM=y CONFIG_BPF=y @@ -2238,7 +2239,6 @@ CONFIG_RTC_DRV_CMOS=y # DMABUF options # CONFIG_SYNC_FILE=y -# CONFIG_UDMABUF is not set # CONFIG_DMABUF_MOVE_NOTIFY is not set # CONFIG_DMABUF_SELFTESTS is not set # CONFIG_DMABUF_HEAPS is not set @@ -2503,18 +2503,14 @@ CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" # CONFIG_PROC_FS=y # CONFIG_PROC_KCORE is not set -# CONFIG_PROC_SYSCTL is not set +CONFIG_PROC_SYSCTL=y # CONFIG_PROC_PAGE_MONITOR is not set # CONFIG_PROC_CHILDREN is not set CONFIG_PROC_PID_ARCH_STATUS=y CONFIG_KERNFS=y CONFIG_SYSFS=y -CONFIG_TMPFS=y -# CONFIG_TMPFS_POSIX_ACL is not set -# CONFIG_TMPFS_XATTR is not set -# CONFIG_TMPFS_INODE64 is not set +# CONFIG_TMPFS is not set # CONFIG_HUGETLBFS is not set -CONFIG_MEMFD_CREATE=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y # CONFIG_CONFIGFS_FS is not set CONFIG_EFIVAR_FS=m diff --git a/config/linux-kgpe-d16_server-whiptail.config b/config/linux-kgpe-d16_server-whiptail.config index 99e9b2716..18a7a2c0c 100644 --- a/config/linux-kgpe-d16_server-whiptail.config +++ b/config/linux-kgpe-d16_server-whiptail.config @@ -160,6 +160,7 @@ CONFIG_INITRAMFS_COMPRESSION_XZ=y # CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_LD_ORPHAN_WARN=y +CONFIG_SYSCTL=y CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_HAVE_PCSPKR_PLATFORM=y CONFIG_BPF=y @@ -2545,18 +2546,14 @@ CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" # CONFIG_PROC_FS=y # CONFIG_PROC_KCORE is not set -# CONFIG_PROC_SYSCTL is not set +CONFIG_PROC_SYSCTL=y # CONFIG_PROC_PAGE_MONITOR is not set # CONFIG_PROC_CHILDREN is not set CONFIG_PROC_PID_ARCH_STATUS=y CONFIG_KERNFS=y CONFIG_SYSFS=y -CONFIG_TMPFS=y -# CONFIG_TMPFS_POSIX_ACL is not set -# CONFIG_TMPFS_XATTR is not set -# CONFIG_TMPFS_INODE64 is not set +# CONFIG_TMPFS is not set # CONFIG_HUGETLBFS is not set -CONFIG_MEMFD_CREATE=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y # CONFIG_CONFIGFS_FS is not set # end of Pseudo filesystems @@ -3185,6 +3182,7 @@ CONFIG_RUNTIME_TESTING_MENU=y # CONFIG_TEST_BLACKHOLE_DEV is not set # CONFIG_FIND_BIT_BENCHMARK is not set # CONFIG_TEST_FIRMWARE is not set +# CONFIG_TEST_SYSCTL is not set # CONFIG_TEST_UDELAY is not set # CONFIG_TEST_STATIC_KEYS is not set # CONFIG_TEST_KMOD is not set diff --git a/config/linux-kgpe-d16_server.config b/config/linux-kgpe-d16_server.config index 99e9b2716..18a7a2c0c 100644 --- a/config/linux-kgpe-d16_server.config +++ b/config/linux-kgpe-d16_server.config @@ -160,6 +160,7 @@ CONFIG_INITRAMFS_COMPRESSION_XZ=y # CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_LD_ORPHAN_WARN=y +CONFIG_SYSCTL=y CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_HAVE_PCSPKR_PLATFORM=y CONFIG_BPF=y @@ -2545,18 +2546,14 @@ CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" # CONFIG_PROC_FS=y # CONFIG_PROC_KCORE is not set -# CONFIG_PROC_SYSCTL is not set +CONFIG_PROC_SYSCTL=y # CONFIG_PROC_PAGE_MONITOR is not set # CONFIG_PROC_CHILDREN is not set CONFIG_PROC_PID_ARCH_STATUS=y CONFIG_KERNFS=y CONFIG_SYSFS=y -CONFIG_TMPFS=y -# CONFIG_TMPFS_POSIX_ACL is not set -# CONFIG_TMPFS_XATTR is not set -# CONFIG_TMPFS_INODE64 is not set +# CONFIG_TMPFS is not set # CONFIG_HUGETLBFS is not set -CONFIG_MEMFD_CREATE=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y # CONFIG_CONFIGFS_FS is not set # end of Pseudo filesystems @@ -3185,6 +3182,7 @@ CONFIG_RUNTIME_TESTING_MENU=y # CONFIG_TEST_BLACKHOLE_DEV is not set # CONFIG_FIND_BIT_BENCHMARK is not set # CONFIG_TEST_FIRMWARE is not set +# CONFIG_TEST_SYSCTL is not set # CONFIG_TEST_UDELAY is not set # CONFIG_TEST_STATIC_KEYS is not set # CONFIG_TEST_KMOD is not set diff --git a/config/linux-kgpe-d16_workstation.config b/config/linux-kgpe-d16_workstation.config index 3d6a8c4f9..40edf7261 100644 --- a/config/linux-kgpe-d16_workstation.config +++ b/config/linux-kgpe-d16_workstation.config @@ -160,6 +160,7 @@ CONFIG_INITRAMFS_COMPRESSION_XZ=y # CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_LD_ORPHAN_WARN=y +CONFIG_SYSCTL=y CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_HAVE_PCSPKR_PLATFORM=y CONFIG_BPF=y @@ -2793,18 +2794,14 @@ CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" # CONFIG_PROC_FS=y # CONFIG_PROC_KCORE is not set -# CONFIG_PROC_SYSCTL is not set +CONFIG_PROC_SYSCTL=y # CONFIG_PROC_PAGE_MONITOR is not set # CONFIG_PROC_CHILDREN is not set CONFIG_PROC_PID_ARCH_STATUS=y CONFIG_KERNFS=y CONFIG_SYSFS=y -CONFIG_TMPFS=y -# CONFIG_TMPFS_POSIX_ACL is not set -# CONFIG_TMPFS_XATTR is not set -# CONFIG_TMPFS_INODE64 is not set +# CONFIG_TMPFS is not set # CONFIG_HUGETLBFS is not set -CONFIG_MEMFD_CREATE=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y # CONFIG_CONFIGFS_FS is not set # end of Pseudo filesystems @@ -3433,6 +3430,7 @@ CONFIG_RUNTIME_TESTING_MENU=y # CONFIG_TEST_BLACKHOLE_DEV is not set # CONFIG_FIND_BIT_BENCHMARK is not set # CONFIG_TEST_FIRMWARE is not set +# CONFIG_TEST_SYSCTL is not set # CONFIG_TEST_UDELAY is not set # CONFIG_TEST_STATIC_KEYS is not set # CONFIG_TEST_KMOD is not set diff --git a/config/linux-librem_common-6.1.8.config b/config/linux-librem_common-6.1.8.config index 9e4752357..70590d5b1 100644 --- a/config/linux-librem_common-6.1.8.config +++ b/config/linux-librem_common-6.1.8.config @@ -182,6 +182,7 @@ CONFIG_INITRAMFS_COMPRESSION_XZ=y # CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_LD_ORPHAN_WARN=y +CONFIG_SYSCTL=y CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_HAVE_PCSPKR_PLATFORM=y CONFIG_EXPERT=y @@ -2475,7 +2476,7 @@ CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" # CONFIG_PROC_FS=y # CONFIG_PROC_KCORE is not set -# CONFIG_PROC_SYSCTL is not set +CONFIG_PROC_SYSCTL=y # CONFIG_PROC_PAGE_MONITOR is not set # CONFIG_PROC_CHILDREN is not set CONFIG_PROC_PID_ARCH_STATUS=y diff --git a/config/linux-librem_common.config b/config/linux-librem_common.config index a3edda0f4..e65f907d1 100644 --- a/config/linux-librem_common.config +++ b/config/linux-librem_common.config @@ -157,6 +157,7 @@ CONFIG_INITRAMFS_COMPRESSION_XZ=y # CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_LD_ORPHAN_WARN=y +CONFIG_SYSCTL=y CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_HAVE_PCSPKR_PLATFORM=y CONFIG_BPF=y @@ -2598,7 +2599,7 @@ CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" # CONFIG_PROC_FS=y # CONFIG_PROC_KCORE is not set -# CONFIG_PROC_SYSCTL is not set +CONFIG_PROC_SYSCTL=y # CONFIG_PROC_PAGE_MONITOR is not set # CONFIG_PROC_CHILDREN is not set CONFIG_PROC_PID_ARCH_STATUS=y diff --git a/config/linux-linuxboot.config b/config/linux-linuxboot.config index 0ff8541bb..25b9963a0 100644 --- a/config/linux-linuxboot.config +++ b/config/linux-linuxboot.config @@ -264,9 +264,9 @@ CONFIG_ISO9660_FS=y CONFIG_JOLIET=y CONFIG_MSDOS_FS=y CONFIG_VFAT_FS=y -# CONFIG_PROC_SYSCTL is not set +CONFIG_PROC_SYSCTL=y # CONFIG_PROC_PAGE_MONITOR is not set -CONFIG_TMPFS=y +CONFIG_TMPFS=n CONFIG_HUGETLBFS=y CONFIG_EFIVAR_FS=y # CONFIG_MISC_FILESYSTEMS is not set diff --git a/config/linux-nitropad-x.config b/config/linux-nitropad-x.config index 8592d579d..40b35f73c 100644 --- a/config/linux-nitropad-x.config +++ b/config/linux-nitropad-x.config @@ -166,7 +166,7 @@ CONFIG_ARCH_SUPPORTS_INT128=y # CONFIG_CHECKPOINT_RESTORE is not set # CONFIG_SCHED_AUTOGROUP is not set # CONFIG_SYSFS_DEPRECATED is not set -CONFIG_RELAY=y +# CONFIG_RELAY is not set CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="@BLOB_DIR@/dev.cpio" CONFIG_INITRAMFS_ROOT_UID=0 @@ -181,10 +181,11 @@ CONFIG_RD_XZ=y CONFIG_INITRAMFS_COMPRESSION_XZ=y # CONFIG_INITRAMFS_COMPRESSION_NONE is not set # CONFIG_BOOT_CONFIG is not set -CONFIG_INITRAMFS_PRESERVE_MTIME=y +# CONFIG_INITRAMFS_PRESERVE_MTIME is not set # CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_LD_ORPHAN_WARN=y +CONFIG_SYSCTL=y CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_HAVE_PCSPKR_PLATFORM=y CONFIG_EXPERT=y @@ -2334,7 +2335,6 @@ CONFIG_RTC_DRV_CMOS=y # DMABUF options # CONFIG_SYNC_FILE=y -# CONFIG_UDMABUF is not set # CONFIG_DMABUF_MOVE_NOTIFY is not set # CONFIG_DMABUF_DEBUG is not set # CONFIG_DMABUF_SELFTESTS is not set @@ -2658,22 +2658,18 @@ CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" # CONFIG_PROC_FS=y # CONFIG_PROC_KCORE is not set -# CONFIG_PROC_SYSCTL is not set +CONFIG_PROC_SYSCTL=y # CONFIG_PROC_PAGE_MONITOR is not set # CONFIG_PROC_CHILDREN is not set CONFIG_PROC_PID_ARCH_STATUS=y CONFIG_KERNFS=y CONFIG_SYSFS=y -CONFIG_TMPFS=y -# CONFIG_TMPFS_POSIX_ACL is not set -# CONFIG_TMPFS_XATTR is not set -# CONFIG_TMPFS_INODE64 is not set +# CONFIG_TMPFS is not set # CONFIG_HUGETLBFS is not set CONFIG_ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y -CONFIG_MEMFD_CREATE=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y # CONFIG_CONFIGFS_FS is not set -CONFIG_EFIVAR_FS=m +# CONFIG_EFIVAR_FS is not set # end of Pseudo filesystems # CONFIG_MISC_FILESYSTEMS is not set @@ -3375,6 +3371,7 @@ CONFIG_RUNTIME_TESTING_MENU=y # CONFIG_TEST_BLACKHOLE_DEV is not set # CONFIG_FIND_BIT_BENCHMARK is not set # CONFIG_TEST_FIRMWARE is not set +# CONFIG_TEST_SYSCTL is not set # CONFIG_TEST_UDELAY is not set # CONFIG_TEST_STATIC_KEYS is not set # CONFIG_TEST_KMOD is not set diff --git a/config/linux-qemu.config b/config/linux-qemu.config index a5145bb0c..113e0ae0a 100644 --- a/config/linux-qemu.config +++ b/config/linux-qemu.config @@ -177,6 +177,7 @@ CONFIG_INITRAMFS_COMPRESSION_XZ=y # CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_LD_ORPHAN_WARN=y +CONFIG_SYSCTL=y CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_HAVE_PCSPKR_PLATFORM=y CONFIG_BPF=y @@ -2270,7 +2271,6 @@ CONFIG_RTC_DRV_CMOS=y # CONFIG_SYNC_FILE=y # CONFIG_SW_SYNC is not set -# CONFIG_UDMABUF is not set # CONFIG_DMABUF_MOVE_NOTIFY is not set # CONFIG_DMABUF_SELFTESTS is not set # CONFIG_DMABUF_HEAPS is not set @@ -2559,18 +2559,14 @@ CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" # CONFIG_PROC_FS=y # CONFIG_PROC_KCORE is not set -# CONFIG_PROC_SYSCTL is not set +CONFIG_PROC_SYSCTL=y # CONFIG_PROC_PAGE_MONITOR is not set # CONFIG_PROC_CHILDREN is not set CONFIG_PROC_PID_ARCH_STATUS=y CONFIG_KERNFS=y CONFIG_SYSFS=y -CONFIG_TMPFS=y -# CONFIG_TMPFS_POSIX_ACL is not set -# CONFIG_TMPFS_XATTR is not set -# CONFIG_TMPFS_INODE64 is not set +# CONFIG_TMPFS is not set # CONFIG_HUGETLBFS is not set -CONFIG_MEMFD_CREATE=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y CONFIG_CONFIGFS_FS=y CONFIG_EFIVAR_FS=m @@ -3201,6 +3197,7 @@ CONFIG_RUNTIME_TESTING_MENU=y # CONFIG_TEST_BLACKHOLE_DEV is not set # CONFIG_FIND_BIT_BENCHMARK is not set # CONFIG_TEST_FIRMWARE is not set +# CONFIG_TEST_SYSCTL is not set # CONFIG_TEST_UDELAY is not set # CONFIG_TEST_STATIC_KEYS is not set # CONFIG_TEST_KMOD is not set diff --git a/config/linux-t440p.config b/config/linux-t440p.config index 7e520b220..2ba0a56af 100644 --- a/config/linux-t440p.config +++ b/config/linux-t440p.config @@ -157,6 +157,7 @@ CONFIG_INITRAMFS_COMPRESSION_XZ=y # CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_LD_ORPHAN_WARN=y +CONFIG_SYSCTL=y CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_HAVE_PCSPKR_PLATFORM=y CONFIG_BPF=y @@ -2252,7 +2253,6 @@ CONFIG_RTC_DRV_CMOS=y # DMABUF options # CONFIG_SYNC_FILE=y -# CONFIG_UDMABUF is not set # CONFIG_DMABUF_MOVE_NOTIFY is not set # CONFIG_DMABUF_SELFTESTS is not set # CONFIG_DMABUF_HEAPS is not set @@ -2517,18 +2517,14 @@ CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" # CONFIG_PROC_FS=y # CONFIG_PROC_KCORE is not set -# CONFIG_PROC_SYSCTL is not set +CONFIG_PROC_SYSCTL=y # CONFIG_PROC_PAGE_MONITOR is not set # CONFIG_PROC_CHILDREN is not set CONFIG_PROC_PID_ARCH_STATUS=y CONFIG_KERNFS=y CONFIG_SYSFS=y -CONFIG_TMPFS=y -# CONFIG_TMPFS_POSIX_ACL is not set -# CONFIG_TMPFS_XATTR is not set -# CONFIG_TMPFS_INODE64 is not set +# CONFIG_TMPFS is not set # CONFIG_HUGETLBFS is not set -CONFIG_MEMFD_CREATE=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y # CONFIG_CONFIGFS_FS is not set CONFIG_EFIVAR_FS=m diff --git a/config/linux-talos-2.config b/config/linux-talos-2.config index 735ac9339..0aa3ac5b1 100644 --- a/config/linux-talos-2.config +++ b/config/linux-talos-2.config @@ -2438,7 +2438,6 @@ CONFIG_RTC_DRV_OPAL=y # CONFIG_SYNC_FILE=y # CONFIG_SW_SYNC is not set -# CONFIG_UDMABUF is not set # CONFIG_DMABUF_SELFTESTS is not set # end of DMABUF options @@ -2755,11 +2754,8 @@ CONFIG_PROC_PAGE_MONITOR=y # CONFIG_PROC_CHILDREN is not set CONFIG_KERNFS=y CONFIG_SYSFS=y -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -CONFIG_TMPFS_XATTR=y +# CONFIG_TMPFS is not set # CONFIG_HUGETLBFS is not set -CONFIG_MEMFD_CREATE=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y # CONFIG_CONFIGFS_FS is not set # end of Pseudo filesystems @@ -2903,7 +2899,6 @@ CONFIG_IO_WQ=y CONFIG_KEYS=y # CONFIG_KEYS_REQUEST_CACHE is not set # CONFIG_PERSISTENT_KEYRINGS is not set -# CONFIG_BIG_KEYS is not set # CONFIG_TRUSTED_KEYS is not set CONFIG_ENCRYPTED_KEYS=y # CONFIG_KEY_DH_OPERATIONS is not set diff --git a/config/linux-w541.config b/config/linux-w541.config index 7e520b220..2ba0a56af 100644 --- a/config/linux-w541.config +++ b/config/linux-w541.config @@ -157,6 +157,7 @@ CONFIG_INITRAMFS_COMPRESSION_XZ=y # CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_LD_ORPHAN_WARN=y +CONFIG_SYSCTL=y CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_HAVE_PCSPKR_PLATFORM=y CONFIG_BPF=y @@ -2252,7 +2253,6 @@ CONFIG_RTC_DRV_CMOS=y # DMABUF options # CONFIG_SYNC_FILE=y -# CONFIG_UDMABUF is not set # CONFIG_DMABUF_MOVE_NOTIFY is not set # CONFIG_DMABUF_SELFTESTS is not set # CONFIG_DMABUF_HEAPS is not set @@ -2517,18 +2517,14 @@ CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" # CONFIG_PROC_FS=y # CONFIG_PROC_KCORE is not set -# CONFIG_PROC_SYSCTL is not set +CONFIG_PROC_SYSCTL=y # CONFIG_PROC_PAGE_MONITOR is not set # CONFIG_PROC_CHILDREN is not set CONFIG_PROC_PID_ARCH_STATUS=y CONFIG_KERNFS=y CONFIG_SYSFS=y -CONFIG_TMPFS=y -# CONFIG_TMPFS_POSIX_ACL is not set -# CONFIG_TMPFS_XATTR is not set -# CONFIG_TMPFS_INODE64 is not set +# CONFIG_TMPFS is not set # CONFIG_HUGETLBFS is not set -CONFIG_MEMFD_CREATE=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y # CONFIG_CONFIGFS_FS is not set CONFIG_EFIVAR_FS=m diff --git a/config/linux-x230-flash.config b/config/linux-x230-flash.config index 1e115d137..e5030ebc3 100644 --- a/config/linux-x230-flash.config +++ b/config/linux-x230-flash.config @@ -1864,7 +1864,6 @@ CONFIG_RTC_DRV_CMOS=y # DMABUF options # CONFIG_SYNC_FILE=y -# CONFIG_UDMABUF is not set # CONFIG_DMABUF_MOVE_NOTIFY is not set # CONFIG_DMABUF_SELFTESTS is not set # CONFIG_DMABUF_HEAPS is not set @@ -2135,12 +2134,8 @@ CONFIG_PROC_SYSCTL=y CONFIG_PROC_PID_ARCH_STATUS=y CONFIG_KERNFS=y CONFIG_SYSFS=y -CONFIG_TMPFS=y -# CONFIG_TMPFS_POSIX_ACL is not set -# CONFIG_TMPFS_XATTR is not set -# CONFIG_TMPFS_INODE64 is not set +# CONFIG_TMPFS is not set # CONFIG_HUGETLBFS is not set -CONFIG_MEMFD_CREATE=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y # CONFIG_CONFIGFS_FS is not set CONFIG_EFIVAR_FS=m diff --git a/config/linux-x230-legacy.config b/config/linux-x230-legacy.config index 84cbacca1..792edc792 100644 --- a/config/linux-x230-legacy.config +++ b/config/linux-x230-legacy.config @@ -1978,7 +1978,6 @@ CONFIG_RTC_DRV_CMOS=y # DMABUF options # CONFIG_SYNC_FILE=y -# CONFIG_UDMABUF is not set # CONFIG_DMABUF_MOVE_NOTIFY is not set # CONFIG_DMABUF_SELFTESTS is not set # CONFIG_DMABUF_HEAPS is not set @@ -2249,12 +2248,8 @@ CONFIG_PROC_SYSCTL=y CONFIG_PROC_PID_ARCH_STATUS=y CONFIG_KERNFS=y CONFIG_SYSFS=y -CONFIG_TMPFS=y -# CONFIG_TMPFS_POSIX_ACL is not set -# CONFIG_TMPFS_XATTR is not set -# CONFIG_TMPFS_INODE64 is not set +# CONFIG_TMPFS is not set # CONFIG_HUGETLBFS is not set -CONFIG_MEMFD_CREATE=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y # CONFIG_CONFIGFS_FS is not set CONFIG_EFIVAR_FS=m diff --git a/config/linux-x230-maximized.config b/config/linux-x230-maximized.config index b408cd0e5..2ebbc1781 100644 --- a/config/linux-x230-maximized.config +++ b/config/linux-x230-maximized.config @@ -157,6 +157,7 @@ CONFIG_INITRAMFS_COMPRESSION_XZ=y # CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_LD_ORPHAN_WARN=y +CONFIG_SYSCTL=y CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_HAVE_PCSPKR_PLATFORM=y CONFIG_BPF=y @@ -2235,7 +2236,6 @@ CONFIG_RTC_DRV_CMOS=y # DMABUF options # CONFIG_SYNC_FILE=y -# CONFIG_UDMABUF is not set # CONFIG_DMABUF_MOVE_NOTIFY is not set # CONFIG_DMABUF_SELFTESTS is not set # CONFIG_DMABUF_HEAPS is not set @@ -2500,18 +2500,14 @@ CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" # CONFIG_PROC_FS=y # CONFIG_PROC_KCORE is not set -# CONFIG_PROC_SYSCTL is not set +CONFIG_PROC_SYSCTL=y # CONFIG_PROC_PAGE_MONITOR is not set # CONFIG_PROC_CHILDREN is not set CONFIG_PROC_PID_ARCH_STATUS=y CONFIG_KERNFS=y CONFIG_SYSFS=y -CONFIG_TMPFS=y -# CONFIG_TMPFS_POSIX_ACL is not set -# CONFIG_TMPFS_XATTR is not set -# CONFIG_TMPFS_INODE64 is not set +# CONFIG_TMPFS is not set # CONFIG_HUGETLBFS is not set -CONFIG_MEMFD_CREATE=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y # CONFIG_CONFIGFS_FS is not set CONFIG_EFIVAR_FS=m From c73687a2327416a64c39e3fb7623c5b9eb2c91e3 Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Mon, 1 Apr 2024 15:20:49 -0400 Subject: [PATCH 2/2] init: Adding checks for sysfs and runtime panic_on_oom=1 Signed-off-by: Thierry Laurion --- initrd/init | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/initrd/init b/initrd/init index 44cde9fa9..67a179b76 100755 --- a/initrd/init +++ b/initrd/init @@ -24,7 +24,7 @@ if [ "$CONFIG_LINUXBOOT" = "y" ]; then mount /sys/firmware/efi/efivars fi -# Setup the pty psudeo filesystem +# Setup the pty pseudo filesystem mkdir /dev/pts mount /dev/pts 2>/dev/ttyprintk @@ -78,6 +78,23 @@ fi TRACE "Under init" +# make sure we have sysctl requirements +if [ ! -d /proc/sys ]; then + warn "BUG!!! The following requirements to apply runtime kernel tweaks are missing:" + warn "CONFIG_SYSCTL=y" + warn "CONFIG_PROC_SYSCTL=y" + warn "Please open an issue" +fi + +if [ ! -e /proc/sys/vm/panic_on_oom ]; then + warn "BUG!!! Requirements to setup Panic when under Out Of Memory situation through PROC_SYSCTL are missing (panic_on_oom was not enabled)" + warn "Please open an issue" +else + DEBUG "Applying panic_on_oom setting to sysctl" + echo 1 > /proc/sys/vm/panic_on_oom +fi + + # set CONFIG_TPM dynamically before init if [ ! -e /dev/tpm0 ]; then CONFIG_TPM='n'