tjh.dev
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 500725d35f..2b735e4df4 100644
14--- a/src/nspawn/nspawn.c
15+++ b/src/nspawn/nspawn.c
16@@ -6189,6 +6189,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@@ -6208,6 +6209,7 @@ static int run(int argc, char *argv[]) {
25 log_error_errno(r, "Unable to determine if %s looks like it has an OS tree (i.e. whether /usr/ exists): %m", arg_directory);
26 goto finish;
27 }
28+#endif
29 }
30
31 } else {