From ca7f6286c518d7ef3877458bbdf8e01f5518ab0e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra 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 51d0c2a75b..4d3451ff3b 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -5017,6 +5017,7 @@ static int run(int argc, char *argv[]) { goto finish; } } else { +#if 0 const char *p, *q; if (arg_pivot_root_new) @@ -5031,6 +5032,7 @@ static int run(int argc, char *argv[]) { r = -EINVAL; goto finish; } +#endif } } else { -- 2.26.2