2021-09-26 12:46:18 +00:00
|
|
|
From a99666d3d7012c2162fdacf84a57fc0b848fd957 Mon Sep 17 00:00:00 2001
|
2020-04-24 23:36:52 +00:00
|
|
|
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
|
|
|
|
Date: Wed, 16 Apr 2014 10:59:28 +0200
|
2021-04-12 18:23:04 +00:00
|
|
|
Subject: [PATCH 03/19] Fix NixOS containers
|
2020-04-24 23:36:52 +00:00
|
|
|
|
|
|
|
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
|
2021-09-26 12:46:18 +00:00
|
|
|
index 04685fecba..0e5ece5f91 100644
|
2020-04-24 23:36:52 +00:00
|
|
|
--- a/src/nspawn/nspawn.c
|
|
|
|
+++ b/src/nspawn/nspawn.c
|
2021-09-26 12:46:18 +00:00
|
|
|
@@ -5590,6 +5590,7 @@ static int run(int argc, char *argv[]) {
|
2020-04-24 23:36:52 +00:00
|
|
|
goto finish;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
+#if 0
|
|
|
|
const char *p, *q;
|
|
|
|
|
|
|
|
if (arg_pivot_root_new)
|
2021-09-26 12:46:18 +00:00
|
|
|
@@ -5604,6 +5605,7 @@ static int run(int argc, char *argv[]) {
|
2020-04-24 23:36:52 +00:00
|
|
|
r = -EINVAL;
|
|
|
|
goto finish;
|
|
|
|
}
|
|
|
|
+#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
} else {
|
|
|
|
--
|
2021-09-26 12:46:18 +00:00
|
|
|
2.32.0
|
2020-04-24 23:36:52 +00:00
|
|
|
|