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

Global replace /var/run/booted-system -> /run/booted-system

Browse Source
This commit is contained in:
Eelco Dolstra 2012-07-16 11:30:37 -04:00
parent 73532c3855
commit 98459eb675
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/services/logging/klogd.nix
View File

@ -13,7 +13,7 @@
exec = exec =
"klogd -c 1 -2 -n " + "klogd -c 1 -2 -n " +
"-k $(dirname $(readlink -f /var/run/booted-system/kernel))/System.map"; "-k $(dirname $(readlink -f /run/booted-system/kernel))/System.map";
}; };
} }

2
modules/system/boot/modprobe.nix
View File

@ -24,7 +24,7 @@ with pkgs.lib;
# modules in the current configuration don't match the # modules in the current configuration don't match the
# running kernel. # running kernel.
if [ ! -d "$MODULE_DIR/$(${pkgs.coreutils}/bin/uname -r)" ]; then if [ ! -d "$MODULE_DIR/$(${pkgs.coreutils}/bin/uname -r)" ]; then
MODULE_DIR=/var/run/booted-system/kernel-modules/lib/modules/ MODULE_DIR=/run/booted-system/kernel-modules/lib/modules/
fi fi
exec ${pkgs.module_init_tools}/sbin/modprobe "$@" exec ${pkgs.module_init_tools}/sbin/modprobe "$@"

4
modules/system/boot/stage-2-init.sh
View File

@ -155,12 +155,12 @@ $systemConfig/activate
# Record the boot configuration. # Record the boot configuration.
ln -sfn "$systemConfig" /var/run/booted-system ln -sfn "$systemConfig" /run/booted-system
# Prevent the booted system form being garbage-collected If it weren't # Prevent the booted system form being garbage-collected If it weren't
# a gcroot, if we were running a different kernel, switched system, # a gcroot, if we were running a different kernel, switched system,
# and garbage collected all, we could not load kernel modules anymore. # and garbage collected all, we could not load kernel modules anymore.
ln -sfn /var/run/booted-system /nix/var/nix/gcroots/booted-system ln -sfn /run/booted-system /nix/var/nix/gcroots/booted-system
# Run any user-specified commands. # Run any user-specified commands.