colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unify extraBindsRW/RO into extraBinds. Now arbitrary mount point is supported.

Browse Source
This commit is contained in:
Ian-Woo Kim 2015-05-25 19:09:53 +00:00
parent cac38c8664
commit c4f66eb85d
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
nixos/modules/virtualisation/containers.nix
View File

@ -41,6 +41,9 @@ let
system = config.nixpkgs.system;
mkBindFlag = d: if d.isReadOnly then " --bind-ro=${d.host}:${d.container}" else " --bind=${d.host}:${d.container}";
mkBindFlags = bs: concatMapStrings mkBindFlag bs;
in
{
@ -128,25 +131,28 @@ in
'';
};
extraBindsRO = mkOption {
type = types.listOf types.str;
extraBinds = mkOption {
type = types.listOf types.attrs;
default = [];
example = [ "/home/alice" ];
example = [ { host = "/home/alice";
container = "/home";
isReadOnly = false; }
];
description =
''
An extra list of directories that is bound to the container with read-only permission.
An extra list of directories that is bound to the container.
'';
};
extraBindsRW = mkOption {
type = types.listOf types.str;
default = [];
example = [ "/home/alice" ];
description =
''
An extra list of directories that is bound to the container with read-only permission.
'';
};
#extraBindsRW = mkOption {
# type = types.listOf types.str;
# default = [];
# example = [ "/home/alice" ];
# description =
# ''
# An extra list of directories that is bound to the container with read-only permission.
# '';
#};
};
@ -359,11 +365,14 @@ in
AUTO_START=1
''}
EXTRABINDS="${concatMapStrings (d: " --bind-ro=${d}") cfg.extraBindsRO + concatMapStrings (d: " --bind=${d}") cfg.extraBindsRW}"
EXTRABINDS="${mkBindFlags cfg.extraBinds}"
'';
}) config.containers;
#"${concatMapStrings (d: " --bind-ro=${d}") cfg.extraBindsRO + concatMapStrings (d: " --bind=${d}") cfg.extraBindsRW}"
# Generate /etc/hosts entries for the containers.
networking.extraHosts = concatStrings (mapAttrsToList (name: cfg: optionalString (cfg.localAddress != null)
''