2017-10-25 14:25:53 +00:00
|
|
|
From eaaa52cc40bc7f94762ca622d4bd3e9440ccee90 Mon Sep 17 00:00:00 2001
|
2017-10-18 13:25:26 +00:00
|
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
|
|
|
Date: Thu, 12 Oct 2017 22:13:03 +0200
|
|
|
|
|
Subject: [PATCH] units: add [Install] section to remote-cryptsetup.target
|
|
|
|
|
|
|
|
|
|
This makes this target the same as remote-fs.target in this regard. In practice
|
|
|
|
|
it probably doesn't make that much difference, because all encrypted devices
|
|
|
|
|
that are part of remote-fs.target (marked with _netdev) will be used for mount
|
|
|
|
|
points, so they will be pulled in anyway individually, but with this change any
|
|
|
|
|
such device will be configured, even if it is not pulled by any other unit.
|
2017-10-25 14:25:53 +00:00
|
|
|
|
|
|
|
|
(cherry picked from commit 8f462b074eb9830d6d5029f70c9010ce50e68357)
|
2017-10-18 13:25:26 +00:00
|
|
|
---
|
|
|
|
|
system-preset/90-systemd.preset | 1 +
|
|
|
|
|
units/remote-cryptsetup.target | 6 ++++++
|
|
|
|
|
2 files changed, 7 insertions(+)
|
|
|
|
|
|
|
|
|
|
diff --git a/system-preset/90-systemd.preset b/system-preset/90-systemd.preset
|
|
|
|
|
index 3ba4bb760d..98bc4c3c55 100644
|
|
|
|
|
--- a/system-preset/90-systemd.preset
|
|
|
|
|
+++ b/system-preset/90-systemd.preset
|
|
|
|
|
@@ -9,6 +9,7 @@
|
|
|
|
|
# generally follow a default-off policy.
|
|
|
|
|
|
|
|
|
|
enable remote-fs.target
|
|
|
|
|
+enable remote-cryptsetup.target
|
|
|
|
|
enable machines.target
|
|
|
|
|
|
|
|
|
|
enable getty@.service
|
|
|
|
|
diff --git a/units/remote-cryptsetup.target b/units/remote-cryptsetup.target
|
|
|
|
|
index 60943bd1cb..c306d521f7 100644
|
|
|
|
|
--- a/units/remote-cryptsetup.target
|
|
|
|
|
+++ b/units/remote-cryptsetup.target
|
|
|
|
|
@@ -8,3 +8,9 @@
|
|
|
|
|
[Unit]
|
|
|
|
|
Description=Remote Encrypted Volumes
|
|
|
|
|
Documentation=man:systemd.special(7)
|
|
|
|
|
+After=remote-cryptsetup-pre.target
|
|
|
|
|
+DefaultDependencies=no
|
|
|
|
|
+Conflicts=shutdown.target
|
|
|
|
|
+
|
|
|
|
|
+[Install]
|
|
|
|
|
+WantedBy=multi-user.target
|
