summary refs log tree commit diff
path: root/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
blob: 56f52b9971e31b1709486ba91a028365de5386be (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
From 3581f8f30270e6340c671a640fe551e954715f8e 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 0842731c18..f790853104 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -5319,6 +5319,7 @@ static int run(int argc, char *argv[]) {
                                 goto finish;
                         }
                 } else {
+#if 0
                         const char *p, *q;
 
                         if (arg_pivot_root_new)
@@ -5333,6 +5334,7 @@ static int run(int argc, char *argv[]) {
                                 r = -EINVAL;
                                 goto finish;
                         }
+#endif
                 }
 
         } else {
-- 
2.29.2