From 09680dec6a6e6c4415bda196fa23721d3d376ad0 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Mon, 4 Mar 2013 19:05:07 +0100
Subject: [PATCH] read-only-store functionality should apply even when
 /nix/store is on a separate filesystem

---
 modules/system/boot/stage-2-init.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index e8b3a4030208..8df7eba5d78e 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -51,10 +51,8 @@ echo "booting system configuration $systemConfig" > /dev/kmsg
 chown 0:30000 /nix/store
 chmod 1775 /nix/store
 if [ -n "@readOnlyStore@" ]; then
-    if ! mountpoint -q /nix/store; then
-        mount --bind /nix/store /nix/store
-        mount -o remount,ro,bind /nix/store
-    fi
+    mount --bind /nix/store /nix/store
+    mount -o remount,ro,bind /nix/store
 fi