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.

32 lines
1.1 KiB
Diff
Raw Normal View History

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 4ce80bba70..bb149192bd 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
2022-06-30 07:46:32 +00:00
@@ -5651,6 +5651,7 @@ static int run(int argc, char *argv[]) {
goto finish;
}
} else {
+#if 0
2022-06-30 07:46:32 +00:00
_cleanup_free_ char *p = NULL;
if (arg_pivot_root_new)
2022-06-30 07:46:32 +00:00
@@ -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 {