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.

diff --git a/Makefile-man.am b/Makefile-man.am
index 481423a963fe0c95be804831cce60e98a6b83c0b..7d620943a2e34a9412431d60edb98e0a73d4dffa 100644 (file)
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -667,16 +667,11 @@ endif
 
 if ENABLE_RANDOMSEED
 MANPAGES += \
-       man/systemd-random-seed-load.service.8
+       man/systemd-random-seed.service.8
 MANPAGES_ALIAS += \
-       man/systemd-random-seed-save.service.8 \
        man/systemd-random-seed.8
-man/systemd-random-seed-save.service.8: man/systemd-random-seed-load.service.8
-man/systemd-random-seed.8: man/systemd-random-seed-load.service.8
-man/systemd-random-seed-save.service.html: man/systemd-random-seed-load.service.html
-       $(html-alias)
-
-man/systemd-random-seed.html: man/systemd-random-seed-load.service.html
+man/systemd-random-seed.8: man/systemd-random-seed.service.8
+man/systemd-random-seed.html: man/systemd-random-seed.service.html
        $(html-alias)
 
 endif

diff --git a/Makefile.am b/Makefile.am
index fa626c5a2fd887e3d4fdf78795fb01270e84f7bc..8d8139c134c60d34e84cf256a5feb980a90690a4 100644 (file)
--- 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

diff --git a/man/systemd-random-seed-load.service.xml b/man/systemd-random-seed.service.xml
similarity index 74%
rename from man/systemd-random-seed-load.service.xml
rename to man/systemd-random-seed.service.xml
index 693c008a2d3c668ec82378c74c544f4fde489111..8cd14b74cb67448cc887916a9c200f5102776596 100644 (file)
--- a/man/systemd-random-seed-load.service.xml
+++ b/man/systemd-random-seed.service.xml
@@ -19,10 +19,10 @@
   You should have received a copy of the GNU Lesser General Public License
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
-<refentry id="systemd-random-seed-load.service" conditional='ENABLE_RANDOMSEED'>
+<refentry id="systemd-random-seed.service" conditional='ENABLE_RANDOMSEED'>
 
         <refentryinfo>
-                <title>systemd-random-seed-load.service</title>
+                <title>systemd-random-seed.service</title>
                 <productname>systemd</productname>
 
                 <authorgroup>
@@ -36,32 +36,27 @@
         </refentryinfo>
 
         <refmeta>
-                <refentrytitle>systemd-random-seed-load.service</refentrytitle>
+                <refentrytitle>systemd-random-seed.service</refentrytitle>
                 <manvolnum>8</manvolnum>
         </refmeta>
 
         <refnamediv>
-                <refname>systemd-random-seed-load.service</refname>
-                <refname>systemd-random-seed-save.service</refname>
+                <refname>systemd-random-seed.service</refname>
                 <refname>systemd-random-seed</refname>
                 <refpurpose>Load and save the system random seed at boot and shutdown</refpurpose>
         </refnamediv>
 
         <refsynopsisdiv>
-                <para><filename>systemd-random-seed-load.service</filename></para>
-                <para><filename>systemd-random-seed-save.service</filename></para>
+                <para><filename>systemd-random-seed.service</filename></para>
                 <para><filename>/usr/lib/systemd/systemd-random-seed</filename></para>
         </refsynopsisdiv>
 
         <refsect1>
                 <title>Description</title>
 
-                <para><filename>systemd-random-seed-load.service</filename>
-                is an early-boot service that restores the random seed
-                of the
-                system. <filename>systemd-random-seed-save.service</filename>
-                is a late-shutdown service that saves the random seed
-                of the system. See
+                <para><filename>systemd-random-seed.service</filename>
+                is a service that restores the random seed of the
+                system at early-boot and saves it at shutdown. See
                 <citerefentry><refentrytitle>random</refentrytitle><manvolnum>4</manvolnum></citerefentry>
                 for details. Saving/restoring the random seed across
                 boots increases the amount of available entropy early

diff --git a/units/.gitignore b/units/.gitignore
index 606d947634adc1de98f2fe70f0ff155d5cb47336..307e09d249560e265382935bf3bba88fb2a5dbb2 100644 (file)
--- 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 (file)
index 3444d4c..0000000
--- 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
similarity index 77%
rename from units/systemd-random-seed-load.service.in
rename to units/systemd-random-seed.service.in
index e9156ef086226c795019698339e4f34e4fb7982a..0c21a04842c9745b1d5c99f16f76b67cc651883e 100644 (file)
--- 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 4a3441c3acbb9bcd4b093cba7774c91fd048f505..67c7d4af437f3494ca182f8f79cc660e08623877 100644 (file)
--- 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