Trying to reconfigure kernel to boot

svn path=/nixpkgs/trunk/; revision=17064

1 files changed, 15 insertions, 3 deletions

diff --git a/pkgs/os-specific/linux/zen-kernel/2.6.31-zen0.nix b/pkgs/os-specific/linux/zen-kernel/2.6.31-zen0.nix
index b90fbb9ca4e3a..606a3280cb2e9 100644
--- a/pkgs/os-specific/linux/zen-kernel/2.6.31-zen0.nix
+++ b/pkgs/os-specific/linux/zen-kernel/2.6.31-zen0.nix
@@ -23,18 +23,30 @@ in
 
   preConfigure = '' 
     killOption () {
-      sed -re "s/$1=[ym]/# $1 is not set/" -i .config
+      sed -re 's/^('"$1"')=[ym]/# \1 is not set/' -i .config
     }
     setOptionMod () {
-      sed -re "s/# $1 is not set/$1=m/" -i .config
+      sed -re 's/^# ('"$1"') is not set/\1=m/' -i .config
+      sed -re "1i$1=m" -i .config
     }
     setOptionYes () {
-      sed -re "s/# $1 is not set/$1=y/" -i .config
+      sed -re 's/^# )'"$1"') is not set/\1=y/' -i .config
+      sed -re "1i$1=y" -i .config
     }
 
     make allmodconfig
 
     killOption CONFIG_IMA
+    killOption 'CONFIG_.*_DEBUG.*'
+    killOption CONFIG_AUDIT_ARCH
+    
+    killOption CONFIG_KERNEL_BZIP2
+    killOption CONFIG_KERNEL_LZMA
+    setOptionYes CONFIG_KERNEL_GZIP
+
+    killOption CONFIG_TASKSTATS
+    killOption CONFIG_PREEMPT_NONE
+    setOptionYes CONFIG_PREEMPT_VOLUNTARY
 
     cp .config ${config}
   '';