From eb3ff76f95bfe248f517e029ea1b152f4983370a 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 c5fd978395..0fa415f5b5 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -5651,6 +5651,7 @@ static int run(int argc, char *argv[]) { goto finish; } } else { +#if 0 _cleanup_free_ char *p = NULL; if (arg_pivot_root_new) @@ -5665,6 +5666,7 @@ static int run(int argc, char *argv[]) { "Directory %s doesn't look like it has an OS tree (/usr/ directory is missing). Refusing.", arg_directory); goto finish; } +#endif } } else { -- 2.36.1