units: add readahead unit files

diff --git a/Makefile.am b/Makefile.am
index 6b306073a839b65ae5860e39fe3d756f2cd899d0..370a3c6ce9169b536e9100a72c2d9e23ff07b791 100644 (file)
--- 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 816eeb3c1ea7bdae751c2fab8ff8956c261a40ed..1ae1f96b11cc28de4676c9245beaf5a8dde45688 100644 (file)
--- 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 860d3a34589bc932a495ff4dd5b3594ff1682bf5..5e2846299a6b6e64a239021eab6fcad0a1602348 100644 (file)
--- 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 089e8b5a2f4adf25f0a94e52aac1bf6ef194b36d..4ff3645e69df530aef9f3d3512283aa2b8f0f4cd 100644 (file)
--- 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 2464a079186b94a22a7cea3cf021e733035c2dd6..72dbb1f56a3897e8a3df9b6367caed1719b60176 100644 (file)
--- 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 d6a5fa69a810398d052ee7156865ed37070fe563..1eb49011f50b835bb9636230f095f53a5bfdd7b4 100644 (file)
--- 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 93cba95a6b942320db266c9b29612f20d9bbaad7..d03f9b841bdc0ea92f1e15a6c8e703e1e578d7d3 100644 (file)
--- 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 (file)
index 0000000..c3fb2e6
--- /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 (file)
index 0000000..f6ca475
--- /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 8ecf64f0e67b031a5ccde2fa20f8fd0499679a55..87c8ccbf04d937872d5bca73a584a69983f76464 100644 (file)
--- 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 66df594ea7f0732274f0ee67dfbefe4b7dbfacc3..52e31e0bc25be9874d8e50bbdc6540b6f8918734 100644 (file)
--- 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 e69a33c8a11fc969bf143cf6ba5091d01c42a2c2..8471ba15adddcd781aa088b3dcc1f756ceca8ef8 100644 (file)
--- 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]