Author: eelco
Date: Sun Jul 18 20:19:27 2010
New Revision: 22627
URL: https://svn.nixos.org/websvn/nix/?rev=22627&sc=1
Log:
* The modprobe wrapper nowadays checks whether the version of the
current kernel module tree matches the booted kernel, so it should
be safe to use after an upgrade.
Modified:
nixos/trunk/modules/system/activation/activation-script.nix
Modified: nixos/trunk/modules/system/activation/activation-script.nix
==============================================================================
--- nixos/trunk/modules/system/activation/activation-script.nix Sun Jul 18
18:29:05 2010 (r22626)
+++ nixos/trunk/modules/system/activation/activation-script.nix Sun Jul 18
20:19:27 2010 (r22627)
@@ -61,14 +61,8 @@
# Allow the kernel to find our wrapped modprobe (which searches
# in the right location in the Nix store for kernel modules).
# We need this when the kernel (or some module) auto-loads a
- # module. This is only done at boot time to make sure that we
- # don't use modules that don't match the running kernel.
- # !!! We should check whether the new kernel modules are
- # compatible with the running kernel so that we can upgrade
- # kernel modules (e.g. the NVIDIA driver) in a running system.
- if [ "$(cat /proc/sys/kernel/modprobe)" = "/sbin/modprobe" ]; then
- echo ${config.system.sbin.modprobe}/sbin/modprobe >
/proc/sys/kernel/modprobe
- fi
+ # module.
+ echo ${config.system.sbin.modprobe}/sbin/modprobe >
/proc/sys/kernel/modprobe
'' [
# ?
];
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
