diff options
| author | Jaka Hudoklin <jakahudoklin@gmail.com> | 2015-02-28 12:19:01 +0100 |
|---|---|---|
| committer | Jaka Hudoklin <jakahudoklin@gmail.com> | 2015-02-28 12:19:01 +0100 |
| commit | 6dc0938a3e3e967e279fce9072445e7d7d4b7d5b (patch) | |
| tree | ce998056159cdc547b8b28d392c635296df2c6de /nixos/modules/virtualisation | |
| parent | eb4c8775ae024f145bf40d39262e5949c42a40cc (diff) | |
| parent | 4106a3b74efa1631e28fc623f99468ff11f3ac36 (diff) | |
| download | nixlib-6dc0938a3e3e967e279fce9072445e7d7d4b7d5b.tar nixlib-6dc0938a3e3e967e279fce9072445e7d7d4b7d5b.tar.gz nixlib-6dc0938a3e3e967e279fce9072445e7d7d4b7d5b.tar.bz2 nixlib-6dc0938a3e3e967e279fce9072445e7d7d4b7d5b.tar.lz nixlib-6dc0938a3e3e967e279fce9072445e7d7d4b7d5b.tar.xz nixlib-6dc0938a3e3e967e279fce9072445e7d7d4b7d5b.tar.zst nixlib-6dc0938a3e3e967e279fce9072445e7d7d4b7d5b.zip | |
Merge pull request #6591 from lseppala/master
Fix rebooting containers where resolv.conf is a symlink
Diffstat (limited to 'nixos/modules/virtualisation')
| -rw-r--r-- | nixos/modules/virtualisation/containers.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index ea6bc641dad8..018e79ae823b 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -212,7 +212,7 @@ in "/nix/var/nix/profiles/per-container/$INSTANCE" \ "/nix/var/nix/gcroots/per-container/$INSTANCE" - cp -f /etc/resolv.conf "$root/etc/resolv.conf" + cp --remove-destination /etc/resolv.conf "$root/etc/resolv.conf" if [ "$PRIVATE_NETWORK" = 1 ]; then extraFlags+=" --network-veth" |