Unverified Commit 1a68e21d authored by Orivej Desh's avatar Orivej Desh Committed by GitHub
Browse files

nixos/systemd: support adding and overriding tmpfiles.d via environment.etc (#96766) 

This allows the user to configure systemd tmpfiles.d via
`environment.etc."tmpfiles.d/X.conf".text = "..."`, which after #93073
causes permission denied (with new X.conf):

```
ln: failed to create symbolic link '/nix/store/...-etc/etc/tmpfiles.d/X.conf': Permission denied
builder for '/nix/store/...-etc.drv' failed with exit code 1
```

or collision between environment.etc and systemd-default-tmpfiles
packages (with existing X.conf, such as tmp.conf):

```
duplicate entry tmpfiles.d/tmp.conf -> /nix/store/...-etc-tmp.conf
mismatched duplicate entry /nix/store/...-systemd-246/example/tmpfiles.d/tmp.conf <-> /nix/store/...-etc-tmp.conf
builder for '/nix/store/...-etc.drv' failed with exit code 1
```

Fixes #96755
parent 5bc44671

nixos/modules/system/boot/systemd.nix

+5 −3
Original line number Diff line number Diff line
@@ -1006,7 +1006,7 @@ in 
      "sysctl.d/50-coredump.conf".source = "${systemd}/example/sysctl.d/50-coredump.conf";

      "sysctl.d/50-default.conf".source = "${systemd}/example/sysctl.d/50-default.conf";



      "tmpfiles.d".source = pkgs.symlinkJoin {

      "tmpfiles.d".source = (pkgs.symlinkJoin {

        name = "tmpfiles.d";

        paths = map (p: p + "/lib/tmpfiles.d") cfg.tmpfiles.packages;

        postBuild = ''
@@ -1016,8 +1016,10 @@ in 
              exit 1

            )

          done

        '';

      };

        '' + concatMapStrings (name: optionalString (hasPrefix "tmpfiles.d/" name) ''

          rm -f $out/${removePrefix "tmpfiles.d/" name}

        '') config.system.build.etc.targets;

      }) + "/*";



      "systemd/system-generators" = { source = hooks "generators" cfg.generators; };

      "systemd/system-shutdown" = { source = hooks "shutdown" cfg.shutdown; };