public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #77294 from worldofpeace/systemd-packages-duplicates

Browse Source 
nixos/systemd-lib: don't fail on systemd.packages duplicates
This commit is contained in:
worldofpeace 2020-01-17 13:16:59 -05:00 committed by GitHub
commit b3c8534911
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/system/boot/systemd-lib.nix
View File

@ -147,7 +147,13 @@ in rec {
done done
# Symlink all units provided listed in systemd.packages. # Symlink all units provided listed in systemd.packages.
for i in ${toString cfg.packages}; do packages="${toString cfg.packages}"
# Filter duplicate directories
declare -A unique_packages
for k in $packages ; do unique_packages[$k]=1 ; done
for i in ''${!unique_packages[@]}; do
for fn in $i/etc/systemd/${type}/* $i/lib/systemd/${type}/*; do for fn in $i/etc/systemd/${type}/* $i/lib/systemd/${type}/*; do
if ! [[ "$fn" =~ .wants$ ]]; then if ! [[ "$fn" =~ .wants$ ]]; then
if [[ -d "$fn" ]]; then if [[ -d "$fn" ]]; then