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

Some fixes in on-boot activation

Browse Source 
svn path=/nixos/branches/modular-nixos/; revision=16525
This commit is contained in:
Michael Raskin 2009-07-31 08:32:53 +00:00
parent f05682c84d
commit 137ce0907c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,9 +61,11 @@ let
# Allow the kernel to find our wrapped modprobe (which searches in the # Allow the kernel to find our wrapped modprobe (which searches in the
# right location in the Nix store for kernel modules). We need this # right location in the Nix store for kernel modules). We need this
# when the kernel (or some module) auto-loads a module. # when the kernel (or some module) auto-loads a module.
# !!! maybe this should only happen at boot time, since we shouldn't # this should only happen at boot time, since we shouldn't
# use modules that don't match the running kernel. # use modules that don't match the running kernel.
echo ${config.system.sbin.modprobe}/sbin/modprobe > /proc/sys/kernel/modprobe if [ "$(cat /proc/sys/kernel/modprobe)" = "/sbin/modprobe" ]; then
echo ${config.system.sbin.modprobe}/sbin/modprobe > /proc/sys/kernel/modprobe
fi
'' [ '' [
# ? # ?
]; ];

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

@ -54,6 +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 .. "
staticEtc=/etc/static staticEtc=/etc/static
rm -f $staticEtc rm -f $staticEtc
ln -s ${makeEtc}/etc $staticEtc ln -s ${makeEtc}/etc $staticEtc
@ -70,6 +71,7 @@ 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