From 2f3072d7d5ea087c8aec45acff308ab3adaaa5c6 Mon Sep 17 00:00:00 2001 From: Daniel Barlow Date: Wed, 5 Oct 2022 21:50:10 +0100 Subject: [PATCH] enable /proc/config.gz previous attempt hadn't noticed that it has a missing dependency --- devices/qemu.nix | 3 --- modules/base.nix | 10 +++++++--- tests/pppoe/configuration.nix | 1 - 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/devices/qemu.nix b/devices/qemu.nix index 5bce6ae..f3a4e0e 100644 --- a/devices/qemu.nix +++ b/devices/qemu.nix @@ -13,9 +13,6 @@ }; }; kernel = { - checkedConfig = { - "BINFMT_SCRIPT" = "y"; - }; config = { SYSVIPC= "y"; NO_HZ= "y"; diff --git a/modules/base.nix b/modules/base.nix index f876193..9607541 100644 --- a/modules/base.nix +++ b/modules/base.nix @@ -45,10 +45,14 @@ in { defaultProfile.packages = with pkgs; [ s6 s6-init-bin busybox execline s6-linux-init s6-rc ]; - kernel.config = { - "IKCONFIG_PROC" = "y"; + kernel = rec { + config = { + IKCONFIG = "y"; + IKCONFIG_PROC = "y"; + PROC_FS = "y"; + }; + checkedConfig = config; }; - users.root = { uid = 0; gid= 0; gecos = "Root of all evaluation"; dir = "/"; diff --git a/tests/pppoe/configuration.nix b/tests/pppoe/configuration.nix index f602c01..b1da896 100644 --- a/tests/pppoe/configuration.nix +++ b/tests/pppoe/configuration.nix @@ -18,7 +18,6 @@ in rec { in address iface { family = "inet4"; address ="192.168.19.1"; prefixLength = 24;}; kernel.config = { - "IKCONFIG_PROC" = "y"; "PPP" = "y"; "PPPOE" = "y"; "PPPOL2TP" = "y";