diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2021-03-31 18:24:19 +0200 |
---|---|---|
committer | Florian Klink <flokli@flokli.de> | 2021-04-01 13:03:28 +0200 |
commit | 1c3a4dbc0dd27992d59bd74a35abcc8a43164506 (patch) | |
tree | bcabd530402c959dbdfe7ca8972013f9459c477b /pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch | |
parent | 4da7569841a53b444ce43a448db54b946d5b9520 (diff) | |
download | nixpkgs-1c3a4dbc0dd27992d59bd74a35abcc8a43164506.tar nixpkgs-1c3a4dbc0dd27992d59bd74a35abcc8a43164506.tar.gz nixpkgs-1c3a4dbc0dd27992d59bd74a35abcc8a43164506.tar.bz2 nixpkgs-1c3a4dbc0dd27992d59bd74a35abcc8a43164506.tar.lz nixpkgs-1c3a4dbc0dd27992d59bd74a35abcc8a43164506.tar.xz nixpkgs-1c3a4dbc0dd27992d59bd74a35abcc8a43164506.tar.zst nixpkgs-1c3a4dbc0dd27992d59bd74a35abcc8a43164506.zip |
systemd: 247.3 -> 247.6
Diffstat (limited to 'pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch')
-rw-r--r-- | pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch b/pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch index 00d085d8a70..05fce10e856 100644 --- a/pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch +++ b/pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch @@ -1,7 +1,7 @@ -From a569dc0bdb43edb79e338c897f06de2dfa81cfc7 Mon Sep 17 00:00:00 2001 +From 63777e7f690b67952bf4571f8e09e5d8e769d3c0 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold <andreas@rammhold.de> Date: Fri, 2 Nov 2018 21:15:42 +0100 -Subject: [PATCH 12/18] inherit systemd environment when calling generators. +Subject: [PATCH 12/19] inherit systemd environment when calling generators. Systemd generators need access to the environment configured in stage-2-init.sh since it schedules fsck and mkfs executions based on @@ -16,10 +16,10 @@ executables that are being called from managers. 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/core/manager.c b/src/core/manager.c -index 1f1450b97c..26b9e41d78 100644 +index 6858950107..07a599ede7 100644 --- a/src/core/manager.c +++ b/src/core/manager.c -@@ -4111,9 +4111,14 @@ static int manager_run_generators(Manager *m) { +@@ -4142,9 +4142,14 @@ static int manager_run_generators(Manager *m) { argv[4] = NULL; RUN_WITH_UMASK(0022) @@ -38,5 +38,5 @@ index 1f1450b97c..26b9e41d78 100644 finish: -- -2.29.2 +2.30.1 |