From 3d6e7d7b560e800de64acbb8a7b874a61c39f305 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Sun, 22 Sep 2024 12:00:48 -0700 Subject: [PATCH] nixos/tmpfiles: only setup nix tmpfiles when nix is used If nix is not installed on the end system, the tmpfiles settings related to it do not need to be setup. --- nixos/modules/system/boot/systemd/tmpfiles.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/nixos/modules/system/boot/systemd/tmpfiles.nix b/nixos/modules/system/boot/systemd/tmpfiles.nix index 44c72f2768cc..9a0f18c26f94 100644 --- a/nixos/modules/system/boot/systemd/tmpfiles.nix +++ b/nixos/modules/system/boot/systemd/tmpfiles.nix @@ -281,15 +281,19 @@ in ) cfg.settings); systemd.tmpfiles.rules = [ - "d /nix/var 0755 root root - -" - "L+ /nix/var/nix/gcroots/booted-system 0755 root root - /run/booted-system" "d /run/lock 0755 root root - -" "d /var/db 0755 root root - -" "L /var/lock - - - - ../run/lock" - # Boot-time cleanup + ] ++ lib.optionals config.nix.enable [ + "d /nix/var 0755 root root - -" + "L+ /nix/var/nix/gcroots/booted-system 0755 root root - /run/booted-system" + ] + # Boot-time cleanup + ++ [ "R! /etc/group.lock - - - - -" "R! /etc/passwd.lock - - - - -" "R! /etc/shadow.lock - - - - -" + ] ++ lib.optionals config.nix.enable [ "R! /nix/var/nix/gcroots/tmp - - - - -" "R! /nix/var/nix/temproots - - - - -" ];