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

systemd: 247.3 -> 247.6

Browse Source
This commit is contained in:
Jörg Thalheim
2021-04-01 13:03:28 +02:00
committed by Florian Klink
parent 4da7569841
commit 1c3a4dbc0d
21 changed files with 108 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
+6 -6
View File
@@ -1,7 +1,7 @@
From 3581f8f30270e6340c671a640fe551e954715f8e Mon Sep 17 00:00:00 2001
From 3d1b2e56a6ed6cc86a64f6f89765a2900e576402 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
Subject: [PATCH 03/19] Fix NixOS containers
In NixOS containers, the init script is bind-mounted into the
container, so checking early whether it exists will fail.
@@ -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 0842731c18..f790853104 100644
index 7515380fcd..14f8a82eb8 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -5319,6 +5319,7 @@ static int run(int argc, char *argv[]) {
@@ -5323,6 +5323,7 @@ static int run(int argc, char *argv[]) {
goto finish;
}
} else {
@@ -21,7 +21,7 @@ index 0842731c18..f790853104 100644
const char *p, *q;
if (arg_pivot_root_new)
@@ -5333,6 +5334,7 @@ static int run(int argc, char *argv[]) {
@@ -5337,6 +5338,7 @@ static int run(int argc, char *argv[]) {
r = -EINVAL;
goto finish;
}
@@ -30,5 +30,5 @@ index 0842731c18..f790853104 100644
} else {
--
2.29.2
2.30.1