public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

systemd: 246.6 -> 247-rc2

Browse Source
This commit is contained in:
Jörg Thalheim
2020-12-02 23:40:04 +01:00
committed by Florian Klink
parent b83ed81c33
commit ef050bc3d1
21 changed files with 104 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
+5 -5
View File
@@ -1,4 +1,4 @@
From a889dbe796cd72425f38dec3d2aaab44a914ac60 Mon Sep 17 00:00:00 2001
From 3581f8f30270e6340c671a640fe551e954715f8e 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 43712565c2..07f294c78a 100644
index 0842731c18..f790853104 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -5122,6 +5122,7 @@ static int run(int argc, char *argv[]) {
@@ -5319,6 +5319,7 @@ static int run(int argc, char *argv[]) {
goto finish;
}
} else {
@@ -21,7 +21,7 @@ index 43712565c2..07f294c78a 100644
const char *p, *q;
if (arg_pivot_root_new)
@@ -5136,6 +5137,7 @@ static int run(int argc, char *argv[]) {
@@ -5333,6 +5334,7 @@ static int run(int argc, char *argv[]) {
r = -EINVAL;
goto finish;
}
@@ -30,5 +30,5 @@ index 43712565c2..07f294c78a 100644
} else {
--
2.28.0
2.29.2