Author: shlevy
Date: Wed Apr 4 21:05:29 2012
New Revision: 33591
URL: https://nixos.org/websvn/nix/?rev=33591&sc=1
Log:
Modprobe needs more libraries in the initrd now, and it needs to think it's
called modprobe
Modified:
nixos/branches/kmod-no-lib-modules/modules/system/boot/stage-1.nix
Modified: nixos/branches/kmod-no-lib-modules/modules/system/boot/stage-1.nix
==============================================================================
--- nixos/branches/kmod-no-lib-modules/modules/system/boot/stage-1.nix Wed Apr
4 21:02:06 2012 (r33590)
+++ nixos/branches/kmod-no-lib-modules/modules/system/boot/stage-1.nix Wed Apr
4 21:05:29 2012 (r33591)
@@ -179,7 +179,11 @@
ln -sv bash $out/bin/sh
# Copy modprobe.
- cp -v ${pkgs.module_init_tools}/sbin/modprobe $out/bin/modprobe.real
+ cp -v ${pkgs.xz}/lib/liblzma.so.5 $out/lib
+ cp -v ${pkgs.zlib}/lib/libz.so* $out/lib
+ cp -v ${pkgs.kmod}/lib/libkmod* $out/lib
+ cp -v ${pkgs.kmod}/sbin/kmod $out/bin
+ cp -v ${pkgs.kmod}/sbin/modprobe $out/bin/modprobe.real
# Maybe copy splashutils.
${optionalString enableSplashScreen ''
@@ -205,7 +209,7 @@
cat > $out/bin/modprobe <<EOF
#! $out/bin/bash
export MODULE_DIR=${modulesClosure}/lib/modules
- exec $out/bin/modprobe.real "\$@"
+ exec -a modprobe $out/bin/modprobe.real "\$@"
EOF
chmod u+x $out/bin/modprobe
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
