From 61fef700eeb7791450e2428564cbc2dc8eb50424 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 1 Jul 2013 14:53:56 -0400 Subject: [PATCH] On linux-3.10, build in #! script support Starting with 3.10, #! script handling can be built modularly (or not at all). By default the nixpkgs builder sets everything modular, but since our initird init is a #! script this creates a chicken-and-egg problem on NixOS. Signed-off-by: Shea Levy --- pkgs/os-specific/linux/kernel/linux-3.10.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index 5e991d750ac3..8c48a5b6c841 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -244,6 +244,9 @@ let # Easier debug of NFS issues SUNRPC_DEBUG y + # Our initrd init uses shebang scripts, so can't be modular + BINFMT_SCRIPT y + ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} ${extraConfig} '';