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

systemd: remove local-fs patch and revert of it

Browse Source
This commit is contained in:
Florian Klink 2020-01-26 15:00:22 +01:00
parent ba770e599c
commit 22bb3a6771
3 changed files with 0 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkgs/os-specific/linux/systemd/0002-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch
View File

@ -1,32 +0,0 @@
From 4e0c6f33ebf49a78abec28d2f4044afb5b8719af Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Jan 2013 15:56:03 +0100
Subject: [PATCH 02/27] sysinit.target: Drop the dependency on local-fs.target
and swap.target
Having all services with DefaultDependencies=yes depend on
local-fs.target is annoying, because some of those services might be
necessary to mount local filesystems. For instance, Charon's
send-keys feature requires sshd to be running in order to receive LUKS
encryption keys, which in turn requires dhcpcd, and so on. So we drop
this dependency (and swap.target as well for consistency). If
services require a specific mount, they should use RequiresMountsFor
in any case.
---
units/sysinit.target | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/units/sysinit.target b/units/sysinit.target
index b6c16a1412..5fe9ad0ec9 100644
--- a/units/sysinit.target
+++ b/units/sysinit.target
@@ -11,5 +11,4 @@
Description=System Initialization
Documentation=man:systemd.special(7)
Conflicts=emergency.service emergency.target
-Wants=local-fs.target swap.target
-After=local-fs.target swap.target emergency.service emergency.target
+After=emergency.service emergency.target
--
2.24.1

27
pkgs/os-specific/linux/systemd/0024-Revert-sysinit.target-Drop-the-dependency-on-local-f.patch
View File

@ -1,27 +0,0 @@
From d8566028d5e71612d011ff06bb9f4d03d1391e8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 22 Sep 2019 21:06:54 +0100
Subject: [PATCH 24/27] Revert "sysinit.target: Drop the dependency on
local-fs.target and swap.target"
This reverts commit 5b0b3d004beb45687347ad01fa3b99635d1bdd92.
We removed that patch in our 242 branch, but somehow it landed in 243 back again.
---
units/sysinit.target | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/units/sysinit.target b/units/sysinit.target
index 5fe9ad0ec9..b6c16a1412 100644
--- a/units/sysinit.target
+++ b/units/sysinit.target
@@ -11,4 +11,5 @@
Description=System Initialization
Documentation=man:systemd.special(7)
Conflicts=emergency.service emergency.target
-After=emergency.service emergency.target
+Wants=local-fs.target swap.target
+After=local-fs.target swap.target emergency.service emergency.target
--
2.24.1

2
pkgs/os-specific/linux/systemd/default.nix
View File

@ -44,7 +44,6 @@ in stdenv.mkDerivation {
patches = [
./0001-Start-device-units-for-uninitialised-encrypted-devic.patch
./0002-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch
./0003-Don-t-try-to-unmount-nix-or-nix-store.patch
./0004-Fix-NixOS-containers.patch
./0005-kmod-static-nodes.service-Don-t-require-lib-modules.patch
@ -66,7 +65,6 @@ in stdenv.mkDerivation {
./0021-add-rootprefix-to-lookup-dir-paths.patch
./0022-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
./0023-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
./0024-Revert-sysinit.target-Drop-the-dependency-on-local-f.patch
./0027-Start-getty-on-lxc.patch
];