From c35b956d34bbb8bb208e49e45de2c103ca11911c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 15 May 2013 22:38:51 +0200 Subject: 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. --- units/.gitignore | 3 +-- units/systemd-random-seed-load.service.in | 18 ------------------ units/systemd-random-seed-save.service.in | 18 ------------------ units/systemd-random-seed.service.in | 21 +++++++++++++++++++++ units/systemd-tmpfiles-setup.service.in | 1 + 5 files changed, 23 insertions(+), 38 deletions(-) delete mode 100644 units/systemd-random-seed-load.service.in delete mode 100644 units/systemd-random-seed-save.service.in create mode 100644 units/systemd-random-seed.service.in (limited to 'units') diff --git a/units/.gitignore b/units/.gitignore index 606d947634..307e09d249 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-load.service.in b/units/systemd-random-seed-load.service.in deleted file mode 100644 index e9156ef086..0000000000 --- a/units/systemd-random-seed-load.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=Load Random Seed -Documentation=man:systemd-random-seed-load.service(8) man:random(4) -DefaultDependencies=no -RequiresMountsFor=@RANDOM_SEED@ -After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service -Before=sysinit.target final.target - -[Service] -Type=oneshot -ExecStart=@rootlibexecdir@/systemd-random-seed load diff --git a/units/systemd-random-seed-save.service.in b/units/systemd-random-seed-save.service.in deleted file mode 100644 index 3444d4ce70..0000000000 --- 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.service.in b/units/systemd-random-seed.service.in new file mode 100644 index 0000000000..0c21a04842 --- /dev/null +++ b/units/systemd-random-seed.service.in @@ -0,0 +1,21 @@ +# 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=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 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 4a3441c3ac..67c7d4af43 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 -- cgit v1.2.3-54-g00ecf