about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-08-19 10:06:16 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-08-19 10:06:48 +0200
commit23db49cf98d6553c56aca99c174c90d84249a2e5 (patch)
treeed39b2b6199535ae90de1b06fc12a5d9a601ce87 /nixos
parent6cc889098ca00e8123485f660d70e14d850120be (diff)
downloadnixlib-23db49cf98d6553c56aca99c174c90d84249a2e5.tar
nixlib-23db49cf98d6553c56aca99c174c90d84249a2e5.tar.gz
nixlib-23db49cf98d6553c56aca99c174c90d84249a2e5.tar.bz2
nixlib-23db49cf98d6553c56aca99c174c90d84249a2e5.tar.lz
nixlib-23db49cf98d6553c56aca99c174c90d84249a2e5.tar.xz
nixlib-23db49cf98d6553c56aca99c174c90d84249a2e5.tar.zst
nixlib-23db49cf98d6553c56aca99c174c90d84249a2e5.zip
Containers: Fix all-containers.service start
Fixes #3662.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/virtualisation/containers.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 847c1eddab2a..292b96e6eb24 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -319,11 +319,14 @@ in
 
         wantedBy = [ "multi-user.target" ];
 
+        unitConfig.ConditionDirectoryNotEmpty = "/etc/containers";
+
         serviceConfig.Type = "oneshot";
 
         script =
           ''
             res=0
+            shopt -s nullglob
             for i in /etc/containers/*.conf; do
               AUTO_START=
               source "$i"