From ae2279bcdb93cbe382832c1e0319be8b614ae63f Mon Sep 17 00:00:00 2001
From: Ian-Woo Kim <ianwookim@gmail.com>
Date: Tue, 26 May 2015 13:41:31 +0000
Subject: nixos-containers: bindMounts: change default to readOnly. use
 EXTRA_NSPAWN_FLAGS

---
 nixos/modules/virtualisation/containers.nix | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'nixos/modules/virtualisation/containers.nix')

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 86c17503fbc..217ef62a1f6 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -47,7 +47,7 @@ let
       mountPoint = mkOption {
         example = "/mnt/usb";
         type = types.str;
-        description = "Location of the mounted in the container file systems";
+        description = "Mount point on the container file system";
       };
       hostPath = mkOption {
         default = null;
@@ -56,7 +56,7 @@ let
         description = "Location of the host path to be mounted";
       };
       isReadOnly = mkOption {
-        default = false;
+        default = true;
         example = true;
         type = types.bool;
         description = "Determine whether the mounted path will be accessed in read-only mode";
@@ -288,7 +288,7 @@ in
             exec ${config.systemd.package}/bin/systemd-nspawn \
               --keep-unit \
               -M "$INSTANCE" -D "$root" $extraFlags \
-              $EXTRABINDS \
+              $EXTRA_NSPAWN_FLAGS \
               --bind-ro=/nix/store \
               --bind-ro=/nix/var/nix/db \
               --bind-ro=/nix/var/nix/daemon-socket \
@@ -384,12 +384,10 @@ in
                 LOCAL_ADDRESS=${cfg.localAddress}
               ''}
             ''}
-           ${optionalString cfg.autoStart ''
-             AUTO_START=1
-           ''}
-
-           EXTRABINDS="${mkBindFlags cfg.bindMounts}"
-
+            ${optionalString cfg.autoStart ''
+              AUTO_START=1
+            ''}
+            EXTRA_NSPAWN_FLAGS="${mkBindFlags cfg.bindMounts}"
           '';
       }) config.containers;
 
-- 
cgit 1.4.1