From 6d1977745528978d38b26b2ad944b34251d47508 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 25 Jan 2013 15:59:53 +0100
Subject: [PATCH] nixos-install: Handle /nix/var/nix/db being on a separate
 filesystem

This is the case on S3-backed EC2 instances.
---
 modules/installer/tools/nixos-install.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index 0739c33e8579..58fe3e327434 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -42,6 +42,7 @@ fi
 mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/mnt $mountPoint/mnt2 $mountPoint/etc /etc/nixos
 mount --make-private / # systemd makes / shared, which is annoying
 mount --bind / $mountPoint/mnt
+mount --bind /nix $mountPoint/mnt/nix
 mount --bind /nix/store $mountPoint/mnt/nix/store
 mount --bind /dev $mountPoint/dev
 mount --bind /dev/shm $mountPoint/dev/shm
@@ -61,6 +62,7 @@ cleanup() {
     umount $mountPoint/dev/shm
     umount $mountPoint/dev
     umount $mountPoint/mnt/nix/store
+    umount $mountPoint/mnt/nix
     umount $mountPoint/mnt
     rmdir $mountPoint/mnt $mountPoint/mnt2
 }