summary refs log blame commit diff
path: root/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
blob: 1f0b8aaf38b330bb7b4f4485cfc0b7012448acf7 (plain) (tree)
1
2
3
4
5
6
7
8
9
10
11
12
                                                                      

                                                 
                                           







                                                             
                                   

                         
                                                              






                                                
                                                              







                                             
      
 
From a889dbe796cd72425f38dec3d2aaab44a914ac60 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Apr 2014 10:59:28 +0200
Subject: [PATCH 03/18] Fix NixOS containers

In NixOS containers, the init script is bind-mounted into the
container, so checking early whether it exists will fail.
---
 src/nspawn/nspawn.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 43712565c2..07f294c78a 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -5122,6 +5122,7 @@ static int run(int argc, char *argv[]) {
                                 goto finish;
                         }
                 } else {
+#if 0
                         const char *p, *q;
 
                         if (arg_pivot_root_new)
@@ -5136,6 +5137,7 @@ static int run(int argc, char *argv[]) {
                                 r = -EINVAL;
                                 goto finish;
                         }
+#endif
                 }
 
         } else {
-- 
2.28.0