public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn path=/nixos/branches/modular-nixos/; revision=16557

Browse Source
This commit is contained in:
Eelco Dolstra 2009-08-03 12:17:23 +00:00
parent 137ce0907c
commit bc54061cba
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/system/activation/activation-script.nix
View File

@ -58,11 +58,14 @@ let
]; ];
modprobe = fullDepEntry '' modprobe = fullDepEntry ''
# Allow the kernel to find our wrapped modprobe (which searches in the # Allow the kernel to find our wrapped modprobe (which searches
# right location in the Nix store for kernel modules). We need this # in the right location in the Nix store for kernel modules).
# when the kernel (or some module) auto-loads a module. # We need this when the kernel (or some module) auto-loads a
# this should only happen at boot time, since we shouldn't # module. This is only done at boot time to make sure that we
# use modules that don't match the running kernel. # 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 if [ "$(cat /proc/sys/kernel/modprobe)" = "/sbin/modprobe" ]; then
echo ${config.system.sbin.modprobe}/sbin/modprobe > /proc/sys/kernel/modprobe echo ${config.system.sbin.modprobe}/sbin/modprobe > /proc/sys/kernel/modprobe
fi fi

3
modules/system/etc/etc.nix
View File

@ -54,7 +54,7 @@ in
activationScripts = { activationScripts = {
etc = pkgs.lib.fullDepEntry '' etc = pkgs.lib.fullDepEntry ''
# Set up the statically computed bits of /etc. # Set up the statically computed bits of /etc.
echo -n "Setting up /etc files .. " echo "setting up /etc..."
staticEtc=/etc/static staticEtc=/etc/static
rm -f $staticEtc rm -f $staticEtc
ln -s ${makeEtc}/etc $staticEtc ln -s ${makeEtc}/etc $staticEtc
@ -71,7 +71,6 @@ in
ln -s $staticEtc/$i /etc/$i ln -s $staticEtc/$i /etc/$i
fi fi
done done
echo ".. done"
# Remove dangling symlinks that point to /etc/static. These are # Remove dangling symlinks that point to /etc/static. These are
# configuration files that existed in a previous configuration but not # configuration files that existed in a previous configuration but not