2013-05-07 12:05:28 +00:00
|
|
|
From 0112df74e576dd683c132ec33861b7099dc94454 Mon Sep 17 00:00:00 2001
|
2013-04-12 12:31:53 +00:00
|
|
|
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
|
|
|
|
|
Date: Fri, 12 Apr 2013 13:16:57 +0200
|
2013-05-07 12:26:29 +00:00
|
|
|
Subject: [PATCH 8/9] Don't try to unmount /nix or /nix/store
|
2013-04-12 12:31:53 +00:00
|
|
|
|
|
|
|
|
They'll still be remounted read-only.
|
|
|
|
|
|
|
|
|
|
https://github.com/NixOS/nixos/issues/126
|
|
|
|
|
---
|
|
|
|
|
src/core/umount.c | 2 ++
|
|
|
|
|
1 file changed, 2 insertions(+)
|
|
|
|
|
|
|
|
|
|
diff --git a/src/core/umount.c b/src/core/umount.c
|
2013-05-07 12:05:28 +00:00
|
|
|
index 1e95ad7..9f0e471 100644
|
2013-04-12 12:31:53 +00:00
|
|
|
--- a/src/core/umount.c
|
|
|
|
|
+++ b/src/core/umount.c
|
|
|
|
|
@@ -435,6 +435,8 @@ static int mount_points_list_umount(MountPoint **head, bool *changed, bool log_e
|
|
|
|
|
* anyway, since we are running from it. They have
|
|
|
|
|
* already been remounted ro. */
|
|
|
|
|
if (path_equal(m->path, "/")
|
|
|
|
|
+ || path_equal(m->path, "/nix")
|
|
|
|
|
+ || path_equal(m->path, "/nix/store")
|
|
|
|
|
#ifndef HAVE_SPLIT_USR
|
|
|
|
|
|| path_equal(m->path, "/usr")
|
|
|
|
|
#endif
|
|
|
|
|
--
|
2013-05-07 12:05:28 +00:00
|
|
|
1.8.2.1
|
2013-04-12 12:31:53 +00:00
|
|
|
|
