mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-13 21:50:33 +03:00
Merge pull request #297517 from kira-bruneau/nixos-containers
nixos/nixos-containers: require mounts for bind mount host paths
This commit is contained in:
commit
f0034ee975
3 changed files with 40 additions and 1 deletions
|
@ -834,7 +834,10 @@ in
|
|||
script = startScript containerConfig;
|
||||
postStart = postStartScript containerConfig;
|
||||
serviceConfig = serviceDirectives containerConfig;
|
||||
unitConfig.RequiresMountsFor = lib.optional (!containerConfig.ephemeral) "${stateDirectory}/%i";
|
||||
unitConfig.RequiresMountsFor = lib.optional (!containerConfig.ephemeral) "${stateDirectory}/%i"
|
||||
++ builtins.map
|
||||
(d: if d.hostPath != null then d.hostPath else d.mountPoint)
|
||||
(builtins.attrValues cfg.bindMounts);
|
||||
environment.root = if containerConfig.ephemeral then "/run/nixos-containers/%i" else "${stateDirectory}/%i";
|
||||
} // (
|
||||
optionalAttrs containerConfig.autoStart
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue