diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-11-08 19:44:16 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-11-08 19:44:16 +0100 |
| commit | 1e2579fdeb7608719cb28da0b5061f48ba0efc34 (patch) | |
| tree | 83352697294bd24015efdce199e8fbc3d2788f6e /src/cryptsetup-generator.c | |
| parent | a40593a0d0d740efa387e35411e1e456a6c5aba7 (diff) | |
| parent | 4cbd9ecf45f64c3a9acc99d473fbf3be3687ae24 (diff) | |
Merge branch 'master' into journal
Diffstat (limited to 'src/cryptsetup-generator.c')
| -rw-r--r-- | src/cryptsetup-generator.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/cryptsetup-generator.c b/src/cryptsetup-generator.c index 6f3aa786bc..a48b7a4562 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" |