diff options
| author | Florian Klink <flokli@flokli.de> | 2020-07-31 18:02:33 +0200 |
|---|---|---|
| committer | Florian Klink <flokli@flokli.de> | 2020-08-13 20:51:39 +0200 |
| commit | 2865490dc23d240fad0dc3eeb7102d10bd259e3c (patch) | |
| tree | f581e006e9110ce39229cbe9e6dea2cdd83b76a4 /pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch | |
| parent | b68bddfbda2092c5fde2c4cece2f4bcf0eb214a1 (diff) | |
| download | nixpkgs-2865490dc23d240fad0dc3eeb7102d10bd259e3c.tar nixpkgs-2865490dc23d240fad0dc3eeb7102d10bd259e3c.tar.gz nixpkgs-2865490dc23d240fad0dc3eeb7102d10bd259e3c.tar.bz2 nixpkgs-2865490dc23d240fad0dc3eeb7102d10bd259e3c.tar.lz nixpkgs-2865490dc23d240fad0dc3eeb7102d10bd259e3c.tar.xz nixpkgs-2865490dc23d240fad0dc3eeb7102d10bd259e3c.tar.zst nixpkgs-2865490dc23d240fad0dc3eeb7102d10bd259e3c.zip | |
systemd: 245.7 -> 246
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.patch | 10 |
1 files changed, 5 insertions, 5 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 index e96593a5938..5ee54f39b74 100644 --- a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch +++ b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch @@ -1,4 +1,4 @@ -From ca7f6286c518d7ef3877458bbdf8e01f5518ab0e Mon Sep 17 00:00:00 2001 +From 794073e466a3b6c8e138f0e6d15c8d6465a1a4a9 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 @@ -10,10 +10,10 @@ container, so checking early whether it exists will fail. 1 file changed, 2 insertions(+) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 51d0c2a75b..4d3451ff3b 100644 +index 3b9493f232..0117a9939d 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -5017,6 +5017,7 @@ static int run(int argc, char *argv[]) { +@@ -5122,6 +5122,7 @@ static int run(int argc, char *argv[]) { goto finish; } } else { @@ -21,7 +21,7 @@ index 51d0c2a75b..4d3451ff3b 100644 const char *p, *q; if (arg_pivot_root_new) -@@ -5031,6 +5032,7 @@ static int run(int argc, char *argv[]) { +@@ -5136,6 +5137,7 @@ static int run(int argc, char *argv[]) { r = -EINVAL; goto finish; } @@ -30,5 +30,5 @@ index 51d0c2a75b..4d3451ff3b 100644 } else { -- -2.26.2 +2.27.0 |