diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-04-20 10:32:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-20 10:32:58 +0100 |
| commit | 2f0ee4bd0bc34e608540c7193a53af314c0cf1da (patch) | |
| tree | 821c9825ffbd4312ab56f6324d21516133ca2acc /nixos/modules | |
| parent | d79c2dd4d4772c26ee95c4980764b56a5e46e4aa (diff) | |
| parent | 4cc7c2e55a231145201edc6473f7919e85473bf3 (diff) | |
| download | nixlib-2f0ee4bd0bc34e608540c7193a53af314c0cf1da.tar nixlib-2f0ee4bd0bc34e608540c7193a53af314c0cf1da.tar.gz nixlib-2f0ee4bd0bc34e608540c7193a53af314c0cf1da.tar.bz2 nixlib-2f0ee4bd0bc34e608540c7193a53af314c0cf1da.tar.lz nixlib-2f0ee4bd0bc34e608540c7193a53af314c0cf1da.tar.xz nixlib-2f0ee4bd0bc34e608540c7193a53af314c0cf1da.tar.zst nixlib-2f0ee4bd0bc34e608540c7193a53af314c0cf1da.zip | |
Merge pull request #85371 from Mic92/tmpfiles
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/system/boot/systemd.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 7f207e6c7ef4..518d875841bd 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -894,6 +894,13 @@ 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/00-nixos.conf".text = '' + # This file is created automatically and should not be modified. + # Please change the option ‘systemd.tmpfiles.rules’ instead. + + ${concatStringsSep "\n" cfg.tmpfiles.rules} + ''; + "tmpfiles.d/home.conf".source = "${systemd}/example/tmpfiles.d/home.conf"; "tmpfiles.d/journal-nocow.conf".source = "${systemd}/example/tmpfiles.d/journal-nocow.conf"; "tmpfiles.d/portables.conf".source = "${systemd}/example/tmpfiles.d/portables.conf"; @@ -906,13 +913,6 @@ in "tmpfiles.d/var.conf".source = "${systemd}/example/tmpfiles.d/var.conf"; "tmpfiles.d/x11.conf".source = "${systemd}/example/tmpfiles.d/x11.conf"; - "tmpfiles.d/nixos.conf".text = '' - # This file is created automatically and should not be modified. - # Please change the option ‘systemd.tmpfiles.rules’ instead. - - ${concatStringsSep "\n" cfg.tmpfiles.rules} - ''; - "systemd/system-generators" = { source = hooks "generators" cfg.generators; }; "systemd/system-shutdown" = { source = hooks "shutdown" cfg.shutdown; }; }); |