From 7b82d1ee27a60157418e241152ef1aa3f909ad7b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 18 Mar 2014 11:04:54 +0100
Subject: Ensure that the container root can always be accessed via
 /var/lib/containers

---
 nixos/modules/virtualisation/containers.nix | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'nixos/modules')

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 49046975d83e..ff17fcc1221d 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -172,6 +172,10 @@ in
               /nix/var/nix/gcroots/per-container/${name}
           ''
 
+          + optionalString (cfg.root != "/var/lib/containers/${name}") ''
+            ln -sfn "${cfg.root}" "/var/lib/containers/${name}"
+          ''
+
           + optionalString cfg.privateNetwork ''
             # Cleanup from last time.
             ip netns del ${ns} 2> /dev/null || true
-- 
cgit 1.4.1