From 2ace7edb81509189a15a0b8e8d0ee1886be9e725 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 18 Mar 2014 18:18:35 +0100
Subject: Rename systemd.containers -> containers

That NixOS containers use systemd-nspawn is just an implementation
detail (which we could change in the future).
---
 nixos/modules/virtualisation/containers.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'nixos/modules/virtualisation')

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index b8388e7f206d..cdd9e729dc16 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -80,7 +80,7 @@ in
       '';
     };
 
-    systemd.containers = mkOption {
+    containers = mkOption {
       type = types.attrsOf (types.submodule (
         { config, options, name, ... }:
         {
@@ -160,7 +160,7 @@ in
                         imports = [ ./container-login.nix ];
                       };
                     in [ extraConfig config.config ];
-                  prefix = [ "systemd" "containers" name ];
+                  prefix = [ "containers" name ];
                 }).config.system.build.toplevel;
               })
             ];
@@ -291,15 +291,15 @@ in
           + "echo ${cfg.path}/bin/switch-to-configuration test "
           + "| ${pkgs.socat}/bin/socat unix:${cfg.root}/var/lib/root-shell.socket -'";
 
-      }) config.systemd.containers;
+      }) config.containers;
 
     # Generate /etc/hosts entries for the containers.
     networking.extraHosts = concatStrings (mapAttrsToList (name: cfg: optionalString (cfg.localAddress != null)
       ''
         ${cfg.localAddress} ${name}.containers
-      '') config.systemd.containers);
+      '') config.containers);
 
-    environment.systemPackages = optional (config.systemd.containers != {}) nixos-container-shell;
+    environment.systemPackages = optional (config.containers != {}) nixos-container-shell;
 
   };
 }
-- 
cgit 1.4.1