mirror of
https://github.com/systemd/systemd-stable.git
synced 2025-01-22 22:03:43 +03:00
units: properly terminate readahead collection 10s after boot
This commit is contained in:
parent
89a2f23dcf
commit
c7b508592b
@ -191,7 +191,8 @@ dist_systemunit_DATA = \
|
||||
units/bluetooth.target \
|
||||
units/smartcard.target \
|
||||
units/tmpwatch.service \
|
||||
units/tmpwatch.timer
|
||||
units/tmpwatch.timer \
|
||||
units/systemd-readahead-done.timer
|
||||
|
||||
nodist_systemunit_DATA = \
|
||||
units/sysinit.target \
|
||||
@ -213,6 +214,7 @@ nodist_systemunit_DATA = \
|
||||
units/systemd-random-seed-load.service \
|
||||
units/systemd-readahead-collect.service \
|
||||
units/systemd-readahead-replay.service \
|
||||
units/systemd-readahead-done.service \
|
||||
units/systemd-tmpfiles.service \
|
||||
units/syslog.target
|
||||
|
||||
@ -243,6 +245,7 @@ EXTRA_DIST = \
|
||||
units/systemd-random-seed-load.service.in \
|
||||
units/systemd-readahead-collect.service.in \
|
||||
units/systemd-readahead-replay.service.in \
|
||||
units/systemd-readahead-done.service.in \
|
||||
units/systemd-tmpfiles.service.in \
|
||||
units/syslog.target.in \
|
||||
units/session/exit.service.in \
|
||||
@ -830,6 +833,7 @@ SED_PROCESS = \
|
||||
$(SED) -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
|
||||
-e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
|
||||
-e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
|
||||
-e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \
|
||||
-e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
|
||||
-e 's,@pkgdatadir\@,$(pkgdatadir),g' \
|
||||
-e 's,@systemunitdir\@,$(systemunitdir),g' \
|
||||
|
2
fixme
2
fixme
@ -9,6 +9,8 @@ v11:
|
||||
|
||||
* emergency.service should start default.target after C-d. synchronize from fedora's initscripts package
|
||||
|
||||
* verify ordering of random-seed-load and base.target!
|
||||
|
||||
later:
|
||||
|
||||
* do not throw error when .service file is linked to /dev/null
|
||||
|
1
units/.gitignore
vendored
1
units/.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
systemd-readahead-done.service
|
||||
systemd-tmpfiles.service
|
||||
systemd-readahead-collect.service
|
||||
systemd-readahead-replay.service
|
||||
|
@ -8,6 +8,7 @@
|
||||
[Unit]
|
||||
Description=Collect Read-Ahead Data
|
||||
DefaultDependencies=no
|
||||
Wants=systemd-readahead-done.timer
|
||||
Conflicts=shutdown.target
|
||||
Before=shutdown.target
|
||||
|
||||
@ -18,4 +19,3 @@ RemainAfterExit=yes
|
||||
|
||||
[Install]
|
||||
WantedBy=default.target
|
||||
Also=systemd-readahead-replay.service
|
||||
|
20
units/systemd-readahead-done.service.in
Normal file
20
units/systemd-readahead-done.service.in
Normal file
@ -0,0 +1,20 @@
|
||||
# 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=Stop Read-Ahead Data Collection
|
||||
DefaultDependencies=no
|
||||
Conflicts=shutdown.target
|
||||
After=default.target
|
||||
Before=shutdown.target
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
ExecStart=@SYSTEMD_NOTIFY@ --readahead=done
|
||||
|
||||
[Install]
|
||||
Also=systemd-readahead-collect.service
|
19
units/systemd-readahead-done.timer
Normal file
19
units/systemd-readahead-done.timer
Normal file
@ -0,0 +1,19 @@
|
||||
# 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=Stop Read-Ahead Data Collection 10s After Completed Startup
|
||||
DefaultDependencies=no
|
||||
Conflicts=shutdown.target
|
||||
After=default.target
|
||||
Before=shutdown.target
|
||||
|
||||
[Timer]
|
||||
OnActiveSec=10s
|
||||
|
||||
[Install]
|
||||
Also=systemd-readahead-collect.service
|
@ -18,4 +18,3 @@ RemainAfterExit=yes
|
||||
|
||||
[Install]
|
||||
WantedBy=default.target
|
||||
Also=systemd-readahead-collect.service
|
||||
|
Loading…
x
Reference in New Issue
Block a user