summary refs log tree commit diff
path: root/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2020-04-30 01:03:18 +0200
committerFlorian Klink <flokli@flokli.de>2020-04-30 01:47:35 +0200
commita3082bc6b796f539cbe02bffbb058966acb629b6 (patch)
tree9995d1f4931f6811a025e06d0b073779d55c9304 /pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
parent8882516056f19f4a12fabd70084f4f246db9f30c (diff)
downloadnixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.tar
nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.tar.gz
nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.tar.bz2
nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.tar.lz
nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.tar.xz
nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.tar.zst
nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.zip
systemd: regenerate patches
It seems nix is much more permissive in applying patches than git am.

These patches were regenerated by running
`git am path/to/nixpkgs/pkgs/os-specific/linux/systemd/*.patch`,
and manually running `patch -p1 < path/to/nixpkgs/pkgs/os-specific/linux/systemd/*N.patch`
where necessary.
Diffstat (limited to 'pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch')
-rw-r--r--pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
new file mode 100644
index 00000000000..fb038c369f8
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
@@ -0,0 +1,34 @@
+From 1ff6f3a4250240e1ba56861e31819fe3c5516844 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 03/18] 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 734dee1130..a97b1a4bc9 100644
+--- a/src/nspawn/nspawn.c
++++ b/src/nspawn/nspawn.c
+@@ -5018,6 +5018,7 @@ static int run(int argc, char *argv[]) {
+                                 goto finish;
+                         }
+                 } else {
++#if 0
+                         const char *p, *q;
+ 
+                         if (arg_pivot_root_new)
+@@ -5032,6 +5033,7 @@ static int run(int argc, char *argv[]) {
+                                 r = -EINVAL;
+                                 goto finish;
+                         }
++#endif
+                 }
+ 
+         } else {
+-- 
+2.26.2
+