diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-29 14:32:04 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-29 14:32:04 +0000 |
commit | 16da00e64d7b7ad1c4b2b1a27111585c1ad3c032 (patch) | |
tree | d3ea97268d8b2d33578434ca28d2313860c646d2 /pkgs/build-support/kernel/modules-closure.nix | |
parent | 7d07afc2faa76f9e5363669bd2b004f8bc12e7e3 (diff) | |
download | nixlib-16da00e64d7b7ad1c4b2b1a27111585c1ad3c032.tar nixlib-16da00e64d7b7ad1c4b2b1a27111585c1ad3c032.tar.gz nixlib-16da00e64d7b7ad1c4b2b1a27111585c1ad3c032.tar.bz2 nixlib-16da00e64d7b7ad1c4b2b1a27111585c1ad3c032.tar.lz nixlib-16da00e64d7b7ad1c4b2b1a27111585c1ad3c032.tar.xz nixlib-16da00e64d7b7ad1c4b2b1a27111585c1ad3c032.tar.zst nixlib-16da00e64d7b7ad1c4b2b1a27111585c1ad3c032.zip |
* Doh! Since r15200, modules-closure.sh generated an empty set of
modules for the initial ramdisk if there were no additional kernel module packages (such as the NVIDIA driver or AUFS), leading to a kernel panic in the initrd. This was because in that case modprobe would print paths referring to the kernel path rather than the module aggregation path, and then `sed "s^$kernel^$out^"' would silently fail. Fixed. * Also, use depmod here rather than doing sed hackery on modules.dep. * Also, `allowMissing' was broken (missing "$" before the variable name). svn path=/nixpkgs/trunk/; revision=15394
Diffstat (limited to 'pkgs/build-support/kernel/modules-closure.nix')
-rw-r--r-- | pkgs/build-support/kernel/modules-closure.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/build-support/kernel/modules-closure.nix b/pkgs/build-support/kernel/modules-closure.nix index 55377859b241..7eac04819790 100644 --- a/pkgs/build-support/kernel/modules-closure.nix +++ b/pkgs/build-support/kernel/modules-closure.nix @@ -8,7 +8,6 @@ stdenv.mkDerivation { name = kernel.name + "-shrunk"; builder = ./modules-closure.sh; - inherit kernel rootModules module_init_tools; + inherit kernel rootModules module_init_tools allowMissing; allowedReferences = ["out"]; - allowMissing = if allowMissing then "true" else ""; } |