units: add readahead unit files

12 files changed, 56 insertions, 2 deletions

diff --git a/Makefile.am b/Makefile.am
index 6b306073a8..370a3c6ce9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -209,6 +209,8 @@ nodist_systemunit_DATA = \
 	units/systemd-update-utmp-shutdown.service \
 	units/systemd-random-seed-save.service \
 	units/systemd-random-seed-load.service \
+	units/systemd-readahead-collect.service \
+	units/systemd-readahead-replay.service \
 	units/syslog.target
 
 dist_sessionunit_DATA = \
@@ -236,6 +238,8 @@ EXTRA_DIST = \
 	units/systemd-update-utmp-shutdown.service.in \
 	units/systemd-random-seed-save.service.in \
 	units/systemd-random-seed-load.service.in \
+	units/systemd-readahead-collect.service.in \
+	units/systemd-readahead-replay.service.in \
 	units/syslog.target.in \
 	units/session/exit.service.in \
 	systemd.pc.in
@@ -1149,4 +1153,3 @@ fedora: install
 	rm /lib/systemd/system/local-fs.target.wants/var-run.mount
 	rm /lib/systemd/system/local-fs.target.wants/var-lock.service
 	rm /lib/systemd/system/local-fs.target.wants/var-lock.mount
-	rm /lib/systemd/system/local-fs.target.wants/remount-rootfs.service
diff --git a/units/.gitignore b/units/.gitignore
index 816eeb3c1e..1ae1f96b11 100644
--- a/units/.gitignore
+++ b/units/.gitignore
@@ -1,3 +1,5 @@
+systemd-readahead-collect.service
+systemd-readahead-replay.service
 serial-getty@.service
 systemd-kmsg-syslogd.service
 systemd-modules-load.service
diff --git a/units/fedora/sysinit.service b/units/fedora/sysinit.service
index 860d3a3458..5e2846299a 100644
--- a/units/fedora/sysinit.service
+++ b/units/fedora/sysinit.service
@@ -9,6 +9,7 @@
 Description=System Initialization
 DefaultDependencies=no
 Conflicts=shutdown.target
+After=systemd-readahead-collect.service systemd-readahead-replay.service
 Before=shutdown.target emergency.service emergency.target
 
 [Service]
diff --git a/units/remount-rootfs.service b/units/remount-rootfs.service
index 089e8b5a2f..4ff3645e69 100644
--- a/units/remount-rootfs.service
+++ b/units/remount-rootfs.service
@@ -9,6 +9,7 @@
 Description=Remount Root FS
 DefaultDependencies=no
 Conflicts=shutdown.target
+After=systemd-readahead-collect.service systemd-readahead-replay.service fsck.target
 Before=shutdown.target local-fs.target
 
 [Service]
diff --git a/units/sysctl.service b/units/sysctl.service
index 2464a07918..72dbb1f56a 100644
--- a/units/sysctl.service
+++ b/units/sysctl.service
@@ -9,6 +9,7 @@
 Description=Apply Kernel Variables
 DefaultDependencies=no
 Conflicts=shutdown.target
+After=systemd-readahead-collect.service systemd-readahead-replay.service
 Before=shutdown.target
 
 [Service]
diff --git a/units/systemd-modules-load.service.in b/units/systemd-modules-load.service.in
index d6a5fa69a8..1eb49011f5 100644
--- a/units/systemd-modules-load.service.in
+++ b/units/systemd-modules-load.service.in
@@ -9,6 +9,7 @@
 Description=Load Kernel Modules
 DefaultDependencies=no
 Conflicts=shutdown.target
+After=systemd-readahead-collect.service systemd-readahead-replay.service
 Before=shutdown.target
 
 [Service]
diff --git a/units/systemd-random-seed-load.service.in b/units/systemd-random-seed-load.service.in
index 93cba95a6b..d03f9b841b 100644
--- a/units/systemd-random-seed-load.service.in
+++ b/units/systemd-random-seed-load.service.in
@@ -11,6 +11,7 @@ DefaultDependencies=no
 Wants=local-fs.target
 After=local-fs.target
 Conflicts=shutdown.target
+After=systemd-readahead-collect.service systemd-readahead-replay.service
 Before=shutdown.target
 
 [Service]
diff --git a/units/systemd-readahead-collect.service.in b/units/systemd-readahead-collect.service.in
new file mode 100644
index 0000000000..c3fb2e6447
--- /dev/null
+++ b/units/systemd-readahead-collect.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 General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Collect Read-Ahead Data
+DefaultDependencies=no
+Conflicts=shutdown.target
+Before=shutdown.target
+
+[Service]
+Type=notify
+ExecStart=@rootlibexecdir@/systemd-readahead-collect
+RemainAfterExit=yes
+
+[Install]
+WantedBy=default.target
+Also=systemd-readahead-replay.service
diff --git a/units/systemd-readahead-replay.service.in b/units/systemd-readahead-replay.service.in
new file mode 100644
index 0000000000..f6ca475ae7
--- /dev/null
+++ b/units/systemd-readahead-replay.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 General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Replay Read-Ahead Data
+DefaultDependencies=no
+Conflicts=shutdown.target
+Before=shutdown.target
+
+[Service]
+Type=notify
+ExecStart=@rootlibexecdir@/systemd-readahead-replay
+RemainAfterExit=yes
+
+[Install]
+WantedBy=default.target
+Also=systemd-readahead-collect.service
diff --git a/units/systemd-remount-api-vfs.service.in b/units/systemd-remount-api-vfs.service.in
index 8ecf64f0e6..87c8ccbf04 100644
--- a/units/systemd-remount-api-vfs.service.in
+++ b/units/systemd-remount-api-vfs.service.in
@@ -9,6 +9,7 @@
 Description=Remount API VFS
 DefaultDependencies=no
 Conflicts=shutdown.target
+After=systemd-readahead-collect.service systemd-readahead-replay.service
 Before=shutdown.target local-fs.target
 
 [Service]
diff --git a/units/systemd-vconsole-setup.service.in b/units/systemd-vconsole-setup.service.in
index 66df594ea7..52e31e0bc2 100644
--- a/units/systemd-vconsole-setup.service.in
+++ b/units/systemd-vconsole-setup.service.in
@@ -9,6 +9,7 @@
 Description=Setup Virtual Console
 DefaultDependencies=no
 Conflicts=shutdown.target
+After=systemd-readahead-collect.service systemd-readahead-replay.service
 Before=shutdown.target
 
 [Service]
diff --git a/units/tmpwatch.service b/units/tmpwatch.service
index e69a33c8a1..8471ba15ad 100644
--- a/units/tmpwatch.service
+++ b/units/tmpwatch.service
@@ -9,7 +9,7 @@
 Description=Cleanup of Temporary Directories
 DefaultDependencies=no
 Wants=local-fs.target
-After=local-fs.target
+After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target
 Before=poweroff.service reboot.service halt.service killall.service
 
 [Service]