diff options
Diffstat (limited to 'units')
| -rw-r--r-- | units/.gitignore | 3 | ||||
| -rw-r--r-- | units/systemd-random-seed-save.service.in | 18 | ||||
| -rw-r--r-- | units/systemd-random-seed.service.in (renamed from units/systemd-random-seed-load.service.in) | 7 | ||||
| -rw-r--r-- | units/systemd-tmpfiles-setup.service.in | 1 |
4 files changed, 7 insertions, 22 deletions
diff --git a/units/.gitignore b/units/.gitignore index 606d94763..307e09d24 100644 --- a/units/.gitignore +++ b/units/.gitignore @@ -41,8 +41,7 @@ /systemd-remount-fs.service /systemd-vconsole-setup.service /systemd-shutdownd.service -/systemd-random-seed-load.service -/systemd-random-seed-save.service +/systemd-random-seed.service /systemd-initctl.service /getty@.service /systemd-update-utmp-runlevel.service diff --git a/units/systemd-random-seed-save.service.in b/units/systemd-random-seed-save.service.in deleted file mode 100644 index 3444d4ce7..000000000 --- a/units/systemd-random-seed-save.service.in +++ /dev/null @@ -1,18 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. - -[Unit] -Description=Save Random Seed -Documentation=man:systemd-random-seed-load.service(8) man:random(4) -DefaultDependencies=no -RequiresMountsFor=@RANDOM_SEED@ -After=systemd-remount-fs.service systemd-random-seed-load.service -Before=final.target - -[Service] -Type=oneshot -ExecStart=@rootlibexecdir@/systemd-random-seed save diff --git a/units/systemd-random-seed-load.service.in b/units/systemd-random-seed.service.in index e9156ef08..0c21a0484 100644 --- a/units/systemd-random-seed-load.service.in +++ b/units/systemd-random-seed.service.in @@ -6,13 +6,16 @@ # (at your option) any later version. [Unit] -Description=Load Random Seed +Description=Load/Save Random Seed Documentation=man:systemd-random-seed-load.service(8) man:random(4) DefaultDependencies=no RequiresMountsFor=@RANDOM_SEED@ +Conflicts=shutdown.target After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service -Before=sysinit.target final.target +Before=sysinit.target shutdown.target [Service] Type=oneshot +RemainAfterExit=yes ExecStart=@rootlibexecdir@/systemd-random-seed load +ExecStop=@rootlibexecdir@/systemd-random-seed save diff --git a/units/systemd-tmpfiles-setup.service.in b/units/systemd-tmpfiles-setup.service.in index 4a3441c3a..67c7d4af4 100644 --- a/units/systemd-tmpfiles-setup.service.in +++ b/units/systemd-tmpfiles-setup.service.in @@ -10,6 +10,7 @@ Description=Recreate Volatile Files and Directories Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8) DefaultDependencies=no Wants=local-fs.target +Conflicts=shutdown.target After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target Before=sysinit.target shutdown.target ConditionDirectoryNotEmpty=|/usr/lib/tmpfiles.d |