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 | |
| parent | 7d07afc2faa76f9e5363669bd2b004f8bc12e7e3 (diff) | |
* 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')
| -rw-r--r-- | pkgs/build-support/kernel/modules-closure.nix | 3 | ||||
| -rw-r--r-- | pkgs/build-support/kernel/modules-closure.sh | 13 |
2 files changed, 7 insertions, 9 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 ""; } diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh index 44e816c4208d..035893ebd69f 100644 --- a/pkgs/build-support/kernel/modules-closure.sh +++ b/pkgs/build-support/kernel/modules-closure.sh @@ -8,14 +8,15 @@ version=$(cd $kernel/lib/modules && ls -d *) echo "kernel version is $version" -export MODULE_DIR=$kernel/lib/modules/ +export MODULE_DIR=$(readlink -f $kernel/lib/modules/) # Determine the dependencies of each root module. closure= for module in $rootModules; do echo "root module: $module" deps=$(modprobe --config /dev/null --set-version "$version" --show-depends "$module" \ - | sed 's/^insmod //') || if test -z "allowMissing"; then exit 1; fi + | sed 's/^insmod //') \ + || if test -z "$allowMissing"; then exit 1; fi #for i in $deps; do echo $i; done closure="$closure $deps" done @@ -23,14 +24,12 @@ done echo "closure:" ensureDir $out for module in $closure; do - target=$(echo $module | sed "s^$kernel^$out^") + target=$(echo $module | sed "s^/nix/store/.*/lib/modules/^$out/lib/modules/^") if test -e "$target"; then continue; fi - echo $module mkdir -p $(dirname $target) + echo $module cp $module $target - grep "^$module" $kernel/lib/modules/$version/modules.dep \ - | sed "s^$kernel^$out^g" \ - >> $out/lib/modules/$version/modules.dep echo $target >> $out/insmod-list done +MODULE_DIR=$out/lib/modules/ depmod -a $version |