diff options
| author | Shea Levy <shea@shealevy.com> | 2016-09-07 05:39:22 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2016-09-07 05:39:22 -0400 |
| commit | 03b888e205e030b2272582d7f4ff037daacc2ab0 (patch) | |
| tree | 9b8501644324b8a084924b64dde7b74c1105e0dd /nixos | |
| parent | 70be99c6459b236bf4cc12eb11182f9a72438085 (diff) | |
| parent | ab9537ca22ce3fd4efc1795c58105504022d0c48 (diff) | |
| download | nixlib-03b888e205e030b2272582d7f4ff037daacc2ab0.tar nixlib-03b888e205e030b2272582d7f4ff037daacc2ab0.tar.gz nixlib-03b888e205e030b2272582d7f4ff037daacc2ab0.tar.bz2 nixlib-03b888e205e030b2272582d7f4ff037daacc2ab0.tar.lz nixlib-03b888e205e030b2272582d7f4ff037daacc2ab0.tar.xz nixlib-03b888e205e030b2272582d7f4ff037daacc2ab0.tar.zst nixlib-03b888e205e030b2272582d7f4ff037daacc2ab0.zip | |
Merge branch 'stage2-generalise-containers' of https://github.com/rickynils/nixpkgs
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/system/boot/stage-2-init.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index 704150e77d72..590c2b9a1410 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -29,14 +29,14 @@ 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. -if [ "$container" != systemd-nspawn ]; then +if [ -z "$container" ]; then mount -n -o remount,rw none / fi # Likewise, stage 1 mounts /proc, /dev and /sys, so if we don't have a # stage 1, we need to do that here. -if [ ! -e /proc/1 ]; then +if [ ! -e /proc/1 ] || [ -n "$container" ]; then specialMount() { local device="$1" local mountPoint="$2" |