diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-12 02:51:20 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-18 17:14:43 +0200 |
| commit | a7a08188bf650ababa36300a9a6f34169e2a73bf (patch) | |
| tree | 98418218fe4ac7ebb0e2c8a63cc143e53d21fe37 /nixos | |
| parent | 32b977d4a7f4615859827780513fdcd7cb21ade7 (diff) | |
| download | nixlib-a7a08188bf650ababa36300a9a6f34169e2a73bf.tar nixlib-a7a08188bf650ababa36300a9a6f34169e2a73bf.tar.gz nixlib-a7a08188bf650ababa36300a9a6f34169e2a73bf.tar.bz2 nixlib-a7a08188bf650ababa36300a9a6f34169e2a73bf.tar.lz nixlib-a7a08188bf650ababa36300a9a6f34169e2a73bf.tar.xz nixlib-a7a08188bf650ababa36300a9a6f34169e2a73bf.tar.zst nixlib-a7a08188bf650ababa36300a9a6f34169e2a73bf.zip | |
Containers: Don't remount /
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/system/boot/stage-2-init.sh | 4 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/container-config.nix | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index fcefdfa88a36..6fff776f8581 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -29,7 +29,9 @@ setPath "@path@" # Normally, stage 1 mounts the root filesystem read/writable. # However, in some environments, stage 2 is executed directly, and the # root is read-only. So make it writable here. -mount -n -o remount,rw none / +if [ "$container" != systemd-nspawn ]; then + mount -n -o remount,rw none / +fi # Likewise, stage 1 mounts /proc, /dev and /sys, so if we don't have a diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix index b81f97f2b4ec..84e3aa283520 100644 --- a/nixos/modules/virtualisation/container-config.nix +++ b/nixos/modules/virtualisation/container-config.nix @@ -89,6 +89,8 @@ with lib; restartIfChanged = false; }; + systemd.services.systemd-remount-fs.enable = false; + }; } |