Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: b297af42d257426bdce617f510381f19365bc69d
https://github.com/NixOS/nixpkgs/commit/b297af42d257426bdce617f510381f19365bc69d
Author: Eelco Dolstra <[email protected]>
Date: 2017-01-03 (Tue, 03 Jan 2017)
Changed paths:
M nixos/modules/system/boot/stage-1-init.sh
Log Message:
-----------
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)
Commit: d496f23df0f9573873221887bcc87b668d31353f
https://github.com/NixOS/nixpkgs/commit/d496f23df0f9573873221887bcc87b668d31353f
Author: Eelco Dolstra <[email protected]>
Date: 2017-01-03 (Tue, 03 Jan 2017)
Changed paths:
M nixos/modules/virtualisation/amazon-image.nix
Log Message:
-----------
amazon-image.nix: Remove redundant log message
(cherry picked from commit c4b5ed5db74cde94b19d519a8d875e3f7df48a76)
Compare: https://github.com/NixOS/nixpkgs/compare/c4175a071b35...d496f23df0f9_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
