From 23db49cf98d6553c56aca99c174c90d84249a2e5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 19 Aug 2014 10:06:16 +0200
Subject: Containers: Fix all-containers.service start

Fixes #3662.
---
 nixos/modules/virtualisation/containers.nix | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'nixos')

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"
-- 
cgit 1.4.1