From 83679c99b1dc1800228a9eb6474d0bd39b298c2b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Apr 2012 11:11:05 +0000
Subject: [PATCH] * Don't put /var and /nix on ephemeral storage if we're
 booting   from EBS.

svn path=/nixos/trunk/; revision=33716
---
 modules/virtualisation/amazon-image.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index 329bf44e5a9..d2aaeec5bd6 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -115,11 +115,13 @@ with pkgs.lib;
           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
     '';