From 256956e34d731087fa18227d3ae838b76389d5fd Mon Sep 17 00:00:00 2001 From: nikstur Date: Fri, 20 Oct 2023 12:22:12 +0200 Subject: [PATCH] nixos/activation: link gcroot with tmpfiles instead of in activation --- nixos/modules/system/activation/activation-script.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix index 424a9d179998..95b0c7bbd681 100644 --- a/nixos/modules/system/activation/activation-script.nix +++ b/nixos/modules/system/activation/activation-script.nix @@ -55,10 +55,6 @@ let # used as a garbage collection root. ln -sfn "$(readlink -f "$systemConfig")" /run/current-system - # Prevent the current configuration from being garbage-collected. - mkdir -p /nix/var/nix/gcroots - ln -sfn /run/current-system /nix/var/nix/gcroots/current-system - exit $_status ''; @@ -237,6 +233,9 @@ in system.activationScripts.specialfs = ""; # obsolete systemd.tmpfiles.rules = [ + # Prevent the current configuration from being garbage-collected. + "d /nix/var/nix/gcroots -" + "L+ /nix/var/nix/gcroots/current-system - - - - /run/current-system" "D /var/empty 0555 root root -" "h /var/empty - - - - +i" ];