summary refs log blame commit diff
path: root/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch
blob: f54430f764e4e2ff98ff5138738e371b71059441 (plain) (tree)
1
2
3
4
5
6
7
8
9
                                                                      

                                                 
                                                              




                                         

                               
                                 
 
                                                              
                                   





                                                                                



                                      
                             
                                                          
                                   

                           
                                                         








                                                    
      
 
From 4e96b2e074c4a4f4ce900409872ce2f86704ee5b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Apr 2013 13:16:57 +0200
Subject: [PATCH 02/19] Don't try to unmount /nix or /nix/store

They'll still be remounted read-only.

https://github.com/NixOS/nixos/issues/126
---
 src/shared/fstab-util.c | 2 ++
 src/shutdown/umount.c   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c
index 292b97cd69..791b8e6b7e 100644
--- a/src/shared/fstab-util.c
+++ b/src/shared/fstab-util.c
@@ -40,6 +40,8 @@ bool fstab_is_extrinsic(const char *mount, const char *opts) {
         /* Don't bother with the OS data itself */
         if (PATH_IN_SET(mount,
                         "/",
+                        "/nix",
+                        "/nix/store",
                         "/usr",
                         "/etc"))
                 return true;
diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c
index 3a72a13e1a..541320dc9d 100644
--- a/src/shutdown/umount.c
+++ b/src/shutdown/umount.c
@@ -500,6 +500,8 @@ static int delete_md(MountPoint *m) {
 
 static bool nonunmountable_path(const char *path) {
         return path_equal(path, "/")
+                || path_equal(path, "/nix")
+                || path_equal(path, "/nix/store")
 #if ! HAVE_SPLIT_USR
                 || path_equal(path, "/usr")
 #endif
-- 
2.30.1