From b14f80c89a30df5242c367c4e16a64ce21413e32 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 18 Jul 2010 20:19:27 +0000 Subject: [PATCH] * 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. svn path=/nixos/trunk/; revision=22627 --- modules/system/activation/activation-script.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix index 637f2503466d..5c6ca55add82 100644 --- a/modules/system/activation/activation-script.nix +++ b/modules/system/activation/activation-script.nix @@ -61,14 +61,8 @@ let # 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 '' [ # ? ];