systemd: drop 0003-Fix-NixOS-containers.patch
This is possibile because of the preparations from b9f2fa1c7d
This commit is contained in:
@@ -1,31 +0,0 @@
|
||||
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 84e94e845a..a0052c1c88 100644
|
||||
--- a/src/nspawn/nspawn.c
|
||||
+++ b/src/nspawn/nspawn.c
|
||||
@@ -6368,6 +6368,7 @@ static int run(int argc, char *argv[]) {
|
||||
goto finish;
|
||||
}
|
||||
} else {
|
||||
+#if 0
|
||||
_cleanup_free_ char *p = NULL;
|
||||
|
||||
if (arg_pivot_root_new)
|
||||
@@ -6387,6 +6388,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
|
||||
}
|
||||
|
||||
if (userns_fd >= 0) {
|
||||
@@ -238,7 +238,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# patches
|
||||
patches = [
|
||||
./0002-Don-t-try-to-unmount-nix-or-nix-store.patch
|
||||
./0003-Fix-NixOS-containers.patch
|
||||
./0004-Add-some-NixOS-specific-unit-directories.patch
|
||||
./0005-Get-rid-of-a-useless-message-in-user-sessions.patch
|
||||
./0006-hostnamed-localed-timedated-disable-methods-that-cha.patch
|
||||
|
||||
Reference in New Issue
Block a user