systemd: 245.7 -> 246

This commit is contained in:
Florian Klink
2020-08-13 20:51:39 +02:00
parent b68bddfbda
commit 2865490dc2
19 changed files with 180 additions and 162 deletions
@@ -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