diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-05-15 22:38:51 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-05-15 22:38:51 +0200 |
| commit | c35b956d34bbb8bb208e49e45de2c103ca11911c (patch) | |
| tree | e3856d4fd3eb71a16028a4e73ac4b5454f87aa9e /Makefile.am | |
| parent | 453a0c2946da620f99825d39db335e9ea9861829 (diff) | |
units: rework systemd-random-seed-{load,save}.service to be a single service
That way ordering it with MountsRequiredFor= works properly, as this no
longer results in mount units start requests to be added to the shutdown
transaction that conflict with stop requests for the same unit.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index fa626c5a2f..8d8139c134 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3162,8 +3162,7 @@ rootlibexec_PROGRAMS += \ systemd-random-seed nodist_systemunit_DATA += \ - units/systemd-random-seed-save.service \ - units/systemd-random-seed-load.service + units/systemd-random-seed.service systemd_random_seed_SOURCES = \ src/random-seed/random-seed.c @@ -3172,16 +3171,13 @@ systemd_random_seed_LDADD = \ libsystemd-label.la \ libsystemd-shared.la -SHUTDOWN_TARGET_WANTS += \ - systemd-random-seed-save.service SYSINIT_TARGET_WANTS += \ - systemd-random-seed-load.service + systemd-random-seed.service endif EXTRA_DIST += \ - units/systemd-random-seed-save.service.in \ - units/systemd-random-seed-load.service.in + units/systemd-random-seed.service.in # ------------------------------------------------------------------------------ if HAVE_LIBCRYPTSETUP |