diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-01-03 17:28:55 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-01-03 17:32:42 +0100 |
| commit | b297af42d257426bdce617f510381f19365bc69d (patch) | |
| tree | 827549a5fa0a7b2441b644b3a4b7ce0266b47bdc /nixos/modules/system/boot/stage-1-init.sh | |
| parent | c4175a071b35379456631c7ece8c01f0ff5c759d (diff) | |
| download | nixlib-b297af42d257426bdce617f510381f19365bc69d.tar nixlib-b297af42d257426bdce617f510381f19365bc69d.tar.gz nixlib-b297af42d257426bdce617f510381f19365bc69d.tar.bz2 nixlib-b297af42d257426bdce617f510381f19365bc69d.tar.lz nixlib-b297af42d257426bdce617f510381f19365bc69d.tar.xz nixlib-b297af42d257426bdce617f510381f19365bc69d.tar.zst nixlib-b297af42d257426bdce617f510381f19365bc69d.zip | |
Fix using ephemeral disks for /tmp etc. in EC2 instances
This code in amazon-image.nix:
if mountFS "$device" "$mp" "" auto; then
if [ -z "$diskForUnionfs" ]; then diskForUnionfs="$mp"; fi
fi
relies on mountFS to return a zero exit status if mounting
succeeds. But the lustrateRoot check in mountFS was causing a non-zero
exit status. As a result /disk0 would be mounted, but not used for
/tmp.
(cherry picked from commit d082ed8c35dec48aee2afd1303b3c8b2a1b242b0)
Diffstat (limited to 'nixos/modules/system/boot/stage-1-init.sh')
| -rw-r--r-- | nixos/modules/system/boot/stage-1-init.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 7803f1bd1aaf..f0699ad9832b 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -318,6 +318,8 @@ mountFS() { [ "$mountPoint" == "/" ] && [ -f "/mnt-root/etc/NIXOS_LUSTRATE" ] && lustrateRoot "/mnt-root" + + true } lustrateRoot () { |