Some fixes in on-boot activation
svn path=/nixos/branches/modular-nixos/; revision=16525
This commit is contained in:
parent
f05682c84d
commit
137ce0907c
|
@ -61,9 +61,11 @@ 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.
|
||||
# !!! 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.
|
||||
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
|
||||
'' [
|
||||
# ?
|
||||
];
|
||||
|
|
|
@ -54,6 +54,7 @@ in
|
|||
activationScripts = {
|
||||
etc = pkgs.lib.fullDepEntry ''
|
||||
# Set up the statically computed bits of /etc.
|
||||
echo -n "Setting up /etc files .. "
|
||||
staticEtc=/etc/static
|
||||
rm -f $staticEtc
|
||||
ln -s ${makeEtc}/etc $staticEtc
|
||||
|
@ -70,6 +71,7 @@ in
|
|||
ln -s $staticEtc/$i /etc/$i
|
||||
fi
|
||||
done
|
||||
echo ".. done"
|
||||
|
||||
# Remove dangling symlinks that point to /etc/static. These are
|
||||
# configuration files that existed in a previous configuration but not
|
||||
|
|
Loading…
Reference in a new issue