nixpkgs/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

35 lines
1.0 KiB
Diff
Raw Normal View History

2021-12-12 02:56:45 +00:00
From d33f3461fa2202ef9b0d6cdf2137c510c59fb052 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Apr 2014 10:59:28 +0200
2021-12-06 14:39:16 +00:00
Subject: [PATCH 03/19] 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
2021-12-12 02:56:45 +00:00
index 8f17ab8810..197e5aa252 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
2021-12-12 02:56:45 +00:00
@@ -5625,6 +5625,7 @@ static int run(int argc, char *argv[]) {
goto finish;
}
} else {
+#if 0
const char *p, *q;
if (arg_pivot_root_new)
2021-12-12 02:56:45 +00:00
@@ -5639,6 +5640,7 @@ static int run(int argc, char *argv[]) {
r = -EINVAL;
goto finish;
}
+#endif
}
} else {
--
2021-12-12 02:56:45 +00:00
2.34.0