summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-11-15 04:11:42 +0100
committerLennart Poettering <lennart@poettering.net>2010-11-15 04:11:42 +0100
commit49d50c55bb78849f25bdf46fa76da5a6bdc5571f (patch)
tree7ad465c9800c02912deb99b9272732482849393e
parent9b3d90907461b6328cb7ff7fe8160d8d409f2b03 (diff)
downloadsystemd-49d50c55bb78849f25bdf46fa76da5a6bdc5571f.tar.gz
cryptsetup: bind cryptsetup service to both source and destination device
-rw-r--r--TODO4
-rw-r--r--src/cryptsetup-generator.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/TODO b/TODO
index 770ac4195e..7b41702e73 100644
--- a/TODO
+++ b/TODO
@@ -82,6 +82,8 @@
* declare /etc/os-release cross-distro standard
+* add ConditionDirectoryNotEmpty=
+
Pre v12:
* fix hotplug transactions
@@ -96,6 +98,8 @@ External:
* pam_securetty should honour console=
+* sysctl should support sysctl.conf.d directory
+
* procps, psmisc, sysvinit-tools, hostname → util-linux-ng
https://bugzilla.redhat.com/show_bug.cgi?id=614245 -- plymouth
diff --git a/src/cryptsetup-generator.c b/src/cryptsetup-generator.c
index 3c3b99de51..b8db0d5e1c 100644
--- a/src/cryptsetup-generator.c
+++ b/src/cryptsetup-generator.c
@@ -100,9 +100,9 @@ static int create_disk(
"[Unit]\n"
"Description=Cryptography Setup for %%f\n"
"DefaultDependencies=no\n"
- "BindTo=%s\n"
+ "BindTo=%s dev-mapper-%%i.device\n"
"After=systemd-readahead-collect.service systemd-readahead-replay.service %s\n"
- "Before=dev-mapper-%%i.device shutdown.target\n",
+ "Before=dev-mapper-%%i.device shutdown.target local-fs.target\n",
d, d);
if (password && (streq(password, "/dev/urandom") ||