32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
|
From 0000000000000000000000000000000000000000 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] 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 6f90f2f418..74b2a237d3 100644
|
||
|
|
--- a/src/nspawn/nspawn.c
|
||
|
|
+++ b/src/nspawn/nspawn.c
|
||
|
|
@@ -6189,6 +6189,7 @@ static int run(int argc, char *argv[]) {
|
||
|
|
goto finish;
|
||
|
|
}
|
||
|
|
} else {
|
||
|
|
+#if 0
|
||
|
|
_cleanup_free_ char *p = NULL;
|
||
|
|
|
||
|
|
if (arg_pivot_root_new)
|
||
|
|
@@ -6208,6 +6209,7 @@ static int run(int argc, char *argv[]) {
|
||
|
|
log_error_errno(r, "Unable to determine if %s looks like it has an OS tree (i.e. whether /usr/ exists): %m", arg_directory);
|
||
|
|
goto finish;
|
||
|
|
}
|
||
|
|
+#endif
|
||
|
|
}
|
||
|
|
|
||
|
|
} else {
|