mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-23 06:03:40 +00:00
c9183d3738
The ConditionFileNotEmpty override patch wasn't correct for stage1, which does have the modules in /lib. So, remove the patch and set the right path with overrides in the final system. Also, make sure systemd-tmpfiles-setup-dev is pulled in to create all the necessary symlinks.
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 4ce80bba70..bb149192bd 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 {
|