about summary refs log tree commit diff
path: root/nixos/modules/system
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-04-22 15:36:04 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-04-22 17:38:53 +0200
commitfa3826dcf40abec1f8c1c8798a761e9ff7a4ab19 (patch)
tree47a88ec0919a48b243db841ad772f0dcc0c89b72 /nixos/modules/system
parent52769d5c17935b99bcb78c16fa02c3c48dc0ae18 (diff)
downloadnixlib-fa3826dcf40abec1f8c1c8798a761e9ff7a4ab19.tar
nixlib-fa3826dcf40abec1f8c1c8798a761e9ff7a4ab19.tar.gz
nixlib-fa3826dcf40abec1f8c1c8798a761e9ff7a4ab19.tar.bz2
nixlib-fa3826dcf40abec1f8c1c8798a761e9ff7a4ab19.tar.lz
nixlib-fa3826dcf40abec1f8c1c8798a761e9ff7a4ab19.tar.xz
nixlib-fa3826dcf40abec1f8c1c8798a761e9ff7a4ab19.tar.zst
nixlib-fa3826dcf40abec1f8c1c8798a761e9ff7a4ab19.zip
Ignore *.wants in systemd.packages for now
Diffstat (limited to 'nixos/modules/system')
-rw-r--r--nixos/modules/system/boot/systemd.nix9
1 files changed, 5 insertions, 4 deletions
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 6c6adab66e7c..4e395899bd3d 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -408,10 +408,11 @@ let
 
       # Symlink all units provided listed in systemd.packages.
       for i in ${toString cfg.packages}; do
-        files=$(echo $i/etc/systemd/${type}/* $i/lib/systemd/${type}/*)
-        if [ -n "$files" ]; then
-          ln -s $files $out/
-        fi
+        for fn in $i/etc/systemd/${type}/* $i/lib/systemd/${type}/*; do
+          if ! [[ "$fn" =~ .wants$ ]]; then
+            ln -s $fn $out/
+          fi
+        done
       done
 
       # Symlink all units defined by systemd.units. If these are also