Unverified Commit 3d6e7d7b authored by Jared Baur's avatar Jared Baur
Browse files

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.
parent c1baeb8d

nixos/modules/system/boot/systemd/tmpfiles.nix

+7 −3
Original line number Diff line number Diff line
@@ -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"

    ] ++ 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             -    -    -    - -"

    ];