[systemd-commits] 2 commits - src/cryptsetup-generator.c TODO

[Lennart Poettering]

 TODO                       |    2 ++
 src/cryptsetup-generator.c |    6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 25d6283acfeb87730c2c0c4c2ef76a66fa397e87
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Nov 1 23:53:15 2011 +0100

    update TODO

diff --git a/TODO b/TODO
index 16cfd21..fe73283 100644
--- a/TODO
+++ b/TODO
@@ -19,6 +19,8 @@ Bugfixes:
 
 Features:
 
+* as Tom Gundersen pointed out there's a always a dep loop if people use crypto file systems with random keys
+
 * unset container= in PID1?
 
 * automatically escape unit names passed on the service (i.e. think "systemctl start serial-getty.service at serial/by-path/jshdfjsdfhkjh" being automatically escaped as necessary.

commit 87e75fddbb3701fd5f4e0d62dc1d661e8d94b071
Author: Tom Gundersen <teg at jklm.no>
Date:   Mon Oct 17 13:01:08 2011 +0200

    cryptsetup-generator: avoid ordering cycle on swap
    
    Devices with random keys (swap), should not be ordered before local-fs.target,
    as this creates a cycle with systemd-load-random-seed.service (and also it
    does not make sense, a swap device is not a local-fs).

diff --git a/src/cryptsetup-generator.c b/src/cryptsetup-generator.c
index 6f3aa78..a48b7a4 100644
--- a/src/cryptsetup-generator.c
+++ b/src/cryptsetup-generator.c
@@ -112,8 +112,7 @@ static int create_disk(
                 "DefaultDependencies=no\n"
                 "BindTo=%s dev-mapper-%%i.device\n"
                 "After=systemd-readahead-collect.service systemd-readahead-replay.service %s\n"
-                "Before=umount.target\n"
-                "Before=local-fs.target\n",
+                "Before=umount.target\n",
                 d, d);
 
         if (!nofail)
@@ -125,6 +124,9 @@ static int create_disk(
                          streq(password, "/dev/hw_random")))
                 fprintf(f,
                         "After=systemd-random-seed-load.service\n");
+        else
+                fprintf(f,
+                        "Before=local-fs.target\n");
 
         fprintf(f,
                 "\n[Service]\n"