2 files changed, 23 insertions, 3 deletions
diff --git a/src/libstore/store.cc b/src/libstore/store.cc
index 9c68c3392b4f..25e2d6e36009 100644
--- a/src/libstore/store.cc
+++ b/src/libstore/store.cc
@@ -76,11 +76,25 @@ static void upgradeStore07();
 static void upgradeStore09();
 
 
-void openDB()
+void openDB(bool reserveSpace)
 {
     if (readOnlyMode) return;
 
     try {
+        Path reservedPath = nixDBPath + "/reserved";
+        off_t reservedSize = 1024 * 1024;
+        if (reserveSpace) {
+            struct stat st;
+            if (stat(reservedPath.c_str(), &st) == -1 ||
+                st.st_size != reservedSize)
+                writeFile(reservedPath, string(1024 * 1024, 'X'));
+        }
+        else
+            deletePath(reservedPath);
+    } catch (SysError & e) { /* don't care about errors */
+    }
+
+    try {
         nixDB.open(nixDBPath);
     } catch (DbNoPermission & e) {
         printMsg(lvlTalkative, "cannot access Nix database; continuing anyway");
diff --git a/src/libstore/store.hh b/src/libstore/store.hh
index 2d8018d5fabc..c617585bab96 100644
--- a/src/libstore/store.hh
+++ b/src/libstore/store.hh
@@ -37,8 +37,14 @@ struct Substitute
 typedef list<Substitute> Substitutes;
 
 
-/* Open the database environment. */
-void openDB();
+/* Open the database environment.  If `reserveSpace' is true, make
+   sure that a big empty file exists in /nix/var/nix/db/reserved.  If
+   `reserveSpace' is false, delete this file if it exists.  The idea
+   is that on normal operation, the file exists; but when we run the
+   garbage collector, it is deleted.  This is to ensure that the
+   garbage collector has a small amount of disk space available, which
+   is required to open the Berkeley DB environment. */
+void openDB(bool reserveSpace = true);
 
 /* Create the required database tables. */
 void initDB();