Author: eelco
Date: Tue Apr 10 11:11:05 2012
New Revision: 33716
URL: https://nixos.org/websvn/nix/?rev=33716&sc=1
Log:
* Don't put /var and /nix on ephemeral storage if we're booting
from EBS.
Modified:
nixos/trunk/modules/virtualisation/amazon-image.nix
Modified: nixos/trunk/modules/virtualisation/amazon-image.nix
==============================================================================
--- nixos/trunk/modules/virtualisation/amazon-image.nix Tue Apr 10 07:13:52
2012 (r33715)
+++ nixos/trunk/modules/virtualisation/amazon-image.nix Tue Apr 10 11:11:05
2012 (r33716)
@@ -115,11 +115,13 @@
mkdir -m 1777 -p $targetRoot/$diskForAufs/root/tmp $targetRoot/tmp
mount --bind $targetRoot/$diskForAufs/root/tmp $targetRoot/tmp
- mkdir -m 755 -p $targetRoot/$diskForAufs/root/var $targetRoot/var
- mount --bind $targetRoot/$diskForAufs/root/var $targetRoot/var
+ if [ ! -e $targetRoot/.ebs ]; then
+ mkdir -m 755 -p $targetRoot/$diskForAufs/root/var $targetRoot/var
+ mount --bind $targetRoot/$diskForAufs/root/var $targetRoot/var
- mkdir -m 755 -p $targetRoot/$diskForAufs/root/nix
- mount -t aufs -o
dirs=$targetRoot/$diskForAufs/root/nix=rw:$targetRoot/nix=rr none
$targetRoot/nix
+ mkdir -m 755 -p $targetRoot/$diskForAufs/root/nix
+ mount -t aufs -o
dirs=$targetRoot/$diskForAufs/root/nix=rw:$targetRoot/nix=rr none
$targetRoot/nix
+ fi
fi
'';
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
