diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-08-17 14:54:39 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-08-17 14:54:39 +0200 |
commit | 0ac85bc455148e4a4b359fb230e3e3cca3b35b72 (patch) | |
tree | 0774fb04a9a494a4d8048f013cc608b7afa605a7 /nixos/modules/system/boot/systemd.nix | |
parent | 566683ab5e76f570f34d0a4ec6484250859fae85 (diff) | |
parent | 914b9788fd18a0eb908c7bf630cb206f5dabd25e (diff) | |
download | nixpkgs-0ac85bc455148e4a4b359fb230e3e3cca3b35b72.tar nixpkgs-0ac85bc455148e4a4b359fb230e3e3cca3b35b72.tar.gz nixpkgs-0ac85bc455148e4a4b359fb230e3e3cca3b35b72.tar.bz2 nixpkgs-0ac85bc455148e4a4b359fb230e3e3cca3b35b72.tar.lz nixpkgs-0ac85bc455148e4a4b359fb230e3e3cca3b35b72.tar.xz nixpkgs-0ac85bc455148e4a4b359fb230e3e3cca3b35b72.tar.zst nixpkgs-0ac85bc455148e4a4b359fb230e3e3cca3b35b72.zip |
Merge master into staging-next
Diffstat (limited to 'nixos/modules/system/boot/systemd.nix')
-rw-r--r-- | nixos/modules/system/boot/systemd.nix | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 39be069ad0e..b215392f250 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -81,10 +81,6 @@ let "systemd-coredump.socket" "systemd-coredump@.service" - # SysV init compatibility. - "systemd-initctl.socket" - "systemd-initctl.service" - # Kernel module loading. "systemd-modules-load.service" "kmod-static-nodes.service" @@ -1012,18 +1008,18 @@ 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 = cfg.tmpfiles.packages; + paths = map (p: p + "/lib/tmpfiles.d") cfg.tmpfiles.packages; postBuild = '' for i in $(cat $pathsPath); do - (test -d $i/lib/tmpfiles.d && test $(ls $i/lib/tmpfiles.d/*.conf | wc -l) -ge 1) || ( - echo "ERROR: The path $i was passed to systemd.tmpfiles.packages but either does not contain the folder lib/tmpfiles.d or if it contains that folder, there are no files ending in .conf in it." + (test -d "$i" && test $(ls "$i"/*.conf | wc -l) -ge 1) || ( + echo "ERROR: The path '$i' from systemd.tmpfiles.packages contains no *.conf files." exit 1 ) done ''; - }) + "/lib/tmpfiles.d"; + }; "systemd/system-generators" = { source = hooks "generators" cfg.generators; }; "systemd/system-shutdown" = { source = hooks "shutdown" cfg.shutdown; }; |