1From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2From: Eelco Dolstra <eelco.dolstra@logicblox.com>
3Date: Wed, 16 Apr 2014 10:59:28 +0200
4Subject: [PATCH] Fix NixOS containers
5
6In NixOS containers, the init script is bind-mounted into the
7container, so checking early whether it exists will fail.
8---
9 src/nspawn/nspawn.c | 2 ++
10 1 file changed, 2 insertions(+)
11
12diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
13index 4fee8a693c..756ce11b1f 100644
14--- a/src/nspawn/nspawn.c
15+++ b/src/nspawn/nspawn.c
16@@ -6028,6 +6028,7 @@ static int run(int argc, char *argv[]) {
17 goto finish;
18 }
19 } else {
20+#if 0
21 _cleanup_free_ char *p = NULL;
22
23 if (arg_pivot_root_new)
24@@ -6044,6 +6045,7 @@ static int run(int argc, char *argv[]) {
25 "Directory %s doesn't look like it has an OS tree (/usr/ directory is missing). Refusing.", arg_directory);
26 goto finish;
27 }
28+#endif
29 }
30
31 } else {