diff --git a/modules/services/logging/klogd.nix b/modules/services/logging/klogd.nix index af21f9cc959..907d83c7a6a 100644 --- a/modules/services/logging/klogd.nix +++ b/modules/services/logging/klogd.nix @@ -13,7 +13,7 @@ exec = "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"; }; } diff --git a/modules/system/boot/modprobe.nix b/modules/system/boot/modprobe.nix index f210ecec26d..41252e2ba0c 100644 --- a/modules/system/boot/modprobe.nix +++ b/modules/system/boot/modprobe.nix @@ -24,7 +24,7 @@ with pkgs.lib; # modules in the current configuration don't match the # running kernel. 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 exec ${pkgs.module_init_tools}/sbin/modprobe "$@" diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh index 51f7bbe8f72..0a42083144d 100644 --- a/modules/system/boot/stage-2-init.sh +++ b/modules/system/boot/stage-2-init.sh @@ -155,12 +155,12 @@ $systemConfig/activate # 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 # a gcroot, if we were running a different kernel, switched system, # 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.