From d6bc8348d5be8576a475ac8ced2b0146e60fb71f Mon Sep 17 00:00:00 2001 From: Daniel Buch Date: Tue, 26 Aug 2014 21:17:22 +0200 Subject: readahead: wipe out readahead --- units/.gitignore | 3 --- units/ldconfig.service | 2 +- units/quotaon.service.in | 2 +- units/system-update.target | 2 +- units/systemd-backlight@.service.in | 2 +- units/systemd-binfmt.service.in | 2 +- units/systemd-firstboot.service.in | 2 +- units/systemd-fsck-root.service.in | 1 - units/systemd-fsck@.service.in | 2 +- units/systemd-journal-catalog-update.service.in | 2 +- units/systemd-modules-load.service.in | 1 - units/systemd-quotacheck.service.in | 2 +- units/systemd-random-seed.service.in | 2 +- units/systemd-readahead-collect.service.in | 28 ------------------------- units/systemd-readahead-done.service.in | 22 ------------------- units/systemd-readahead-done.timer | 22 ------------------- units/systemd-readahead-drop.service | 19 ----------------- units/systemd-readahead-replay.service.in | 26 ----------------------- units/systemd-remount-fs.service.in | 2 +- units/systemd-rfkill@.service.in | 2 +- units/systemd-sysctl.service.in | 1 - units/systemd-sysusers.service.in | 2 +- units/systemd-tmpfiles-clean.service.in | 2 +- units/systemd-tmpfiles-setup-dev.service.in | 2 +- units/systemd-tmpfiles-setup.service.in | 2 +- units/systemd-udev-hwdb-update.service.in | 2 +- units/systemd-update-done.service.in | 2 +- units/systemd-update-utmp.service.in | 2 +- units/systemd-vconsole-setup.service.in | 1 - 29 files changed, 19 insertions(+), 143 deletions(-) delete mode 100644 units/systemd-readahead-collect.service.in delete mode 100644 units/systemd-readahead-done.service.in delete mode 100644 units/systemd-readahead-done.timer delete mode 100644 units/systemd-readahead-drop.service delete mode 100644 units/systemd-readahead-replay.service.in (limited to 'units') diff --git a/units/.gitignore b/units/.gitignore index ab1d97da54..a1276e5b61 100644 --- a/units/.gitignore +++ b/units/.gitignore @@ -47,9 +47,6 @@ /systemd-poweroff.service /systemd-quotacheck.service /systemd-random-seed.service -/systemd-readahead-collect.service -/systemd-readahead-done.service -/systemd-readahead-replay.service /systemd-reboot.service /systemd-remount-fs.service /systemd-resolved.service diff --git a/units/ldconfig.service b/units/ldconfig.service index 43c145b726..f9691e2f2d 100644 --- a/units/ldconfig.service +++ b/units/ldconfig.service @@ -10,7 +10,7 @@ Description=Rebuild Dynamic Linker Cache Documentation=man:ldconfig(8) DefaultDependencies=no Conflicts=shutdown.target -After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service +After=systemd-remount-fs.service Before=sysinit.target shutdown.target systemd-update-done.service ConditionNeedsUpdate=/etc diff --git a/units/quotaon.service.in b/units/quotaon.service.in index 49a50a7feb..7d59a40195 100644 --- a/units/quotaon.service.in +++ b/units/quotaon.service.in @@ -9,7 +9,7 @@ Description=Enable File System Quotas Documentation=man:quotaon(8) DefaultDependencies=no -After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-quotacheck.service +After=systemd-quotacheck.service Before=local-fs.target shutdown.target ConditionPathExists=@QUOTAON@ diff --git a/units/system-update.target b/units/system-update.target index d0f847f957..48d46fcbda 100644 --- a/units/system-update.target +++ b/units/system-update.target @@ -10,7 +10,7 @@ Description=System Update Documentation=http://freedesktop.org/wiki/Software/systemd/SystemUpdates Documentation=man:systemd.special(7) man:systemd-system-update-generator(8) Requires=sysinit.target -Conflicts=shutdown.target systemd-readahead-collect.service systemd-readahead-replay.service +Conflicts=shutdown.target After=sysinit.target Before=shutdown.target AllowIsolate=yes diff --git a/units/systemd-backlight@.service.in b/units/systemd-backlight@.service.in index e945d8733f..ecf3de48d7 100644 --- a/units/systemd-backlight@.service.in +++ b/units/systemd-backlight@.service.in @@ -11,7 +11,7 @@ Documentation=man:systemd-backlight@.service(8) DefaultDependencies=no RequiresMountsFor=/var/lib/systemd/backlight Conflicts=shutdown.target -After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service +After=systemd-remount-fs.service Before=sysinit.target shutdown.target [Service] diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in index 02dfe774df..34a5d5237b 100644 --- a/units/systemd-binfmt.service.in +++ b/units/systemd-binfmt.service.in @@ -11,7 +11,7 @@ Documentation=man:systemd-binfmt.service(8) man:binfmt.d(5) Documentation=https://www.kernel.org/doc/Documentation/binfmt_misc.txt DefaultDependencies=no Conflicts=shutdown.target -After=systemd-readahead-collect.service systemd-readahead-replay.service proc-sys-fs-binfmt_misc.automount +After=proc-sys-fs-binfmt_misc.automount Before=sysinit.target shutdown.target ConditionPathIsReadWrite=/proc/sys/ ConditionDirectoryNotEmpty=|/lib/binfmt.d diff --git a/units/systemd-firstboot.service.in b/units/systemd-firstboot.service.in index 6cdde5b82d..7a448ac936 100644 --- a/units/systemd-firstboot.service.in +++ b/units/systemd-firstboot.service.in @@ -10,7 +10,7 @@ Description=First Boot Wizard Documentation=man:systemd-firstboot(1) DefaultDependencies=no Conflicts=shutdown.target -After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service systemd-sysusers.service +After=systemd-remount-fs.service systemd-sysusers.service Before=sysinit.target shutdown.target ConditionPathIsReadWrite=/etc ConditionFirstBoot=yes diff --git a/units/systemd-fsck-root.service.in b/units/systemd-fsck-root.service.in index 26cce5131e..6d7657853e 100644 --- a/units/systemd-fsck-root.service.in +++ b/units/systemd-fsck-root.service.in @@ -9,7 +9,6 @@ Description=File System Check on Root Device Documentation=man:systemd-fsck-root.service(8) DefaultDependencies=no -After=systemd-readahead-collect.service systemd-readahead-replay.service Before=local-fs.target shutdown.target ConditionPathIsReadWrite=!/ diff --git a/units/systemd-fsck@.service.in b/units/systemd-fsck@.service.in index d2cda6a466..857e625679 100644 --- a/units/systemd-fsck@.service.in +++ b/units/systemd-fsck@.service.in @@ -10,7 +10,7 @@ Description=File System Check on %f Documentation=man:systemd-fsck@.service(8) DefaultDependencies=no BindsTo=%i.device -After=systemd-readahead-collect.service systemd-readahead-replay.service %i.device systemd-fsck-root.service local-fs-pre.target +After=%i.device systemd-fsck-root.service local-fs-pre.target Before=shutdown.target [Service] diff --git a/units/systemd-journal-catalog-update.service.in b/units/systemd-journal-catalog-update.service.in index 0cb7076f12..bfa5e6b435 100644 --- a/units/systemd-journal-catalog-update.service.in +++ b/units/systemd-journal-catalog-update.service.in @@ -10,7 +10,7 @@ Description=Rebuild Journal Catalog Documentation=man:systemd-journald.service(8) man:journald.conf(5) DefaultDependencies=no Conflicts=shutdown.target -After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target +After=local-fs.target Before=sysinit.target shutdown.target systemd-update-done.service ConditionNeedsUpdate=/etc diff --git a/units/systemd-modules-load.service.in b/units/systemd-modules-load.service.in index 32deb52e26..040a0febe8 100644 --- a/units/systemd-modules-load.service.in +++ b/units/systemd-modules-load.service.in @@ -10,7 +10,6 @@ Description=Load Kernel Modules Documentation=man:systemd-modules-load.service(8) man:modules-load.d(5) DefaultDependencies=no Conflicts=shutdown.target -After=systemd-readahead-collect.service systemd-readahead-replay.service Before=sysinit.target shutdown.target ConditionCapability=CAP_SYS_MODULE ConditionDirectoryNotEmpty=|/lib/modules-load.d diff --git a/units/systemd-quotacheck.service.in b/units/systemd-quotacheck.service.in index f726ea1bcd..5cb9bc3bc9 100644 --- a/units/systemd-quotacheck.service.in +++ b/units/systemd-quotacheck.service.in @@ -9,7 +9,7 @@ Description=File System Quota Check Documentation=man:systemd-quotacheck.service(8) DefaultDependencies=no -After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service +After=systemd-remount-fs.service Before=local-fs.target shutdown.target ConditionPathExists=@QUOTACHECK@ diff --git a/units/systemd-random-seed.service.in b/units/systemd-random-seed.service.in index 1879b2f24c..b55844b36f 100644 --- a/units/systemd-random-seed.service.in +++ b/units/systemd-random-seed.service.in @@ -11,7 +11,7 @@ Documentation=man:systemd-random-seed.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 +After=systemd-remount-fs.service Before=sysinit.target shutdown.target [Service] diff --git a/units/systemd-readahead-collect.service.in b/units/systemd-readahead-collect.service.in deleted file mode 100644 index d4b8e67932..0000000000 --- a/units/systemd-readahead-collect.service.in +++ /dev/null @@ -1,28 +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=Collect Read-Ahead Data -Documentation=man:systemd-readahead-replay.service(8) -DefaultDependencies=no -Wants=systemd-readahead-done.timer -Conflicts=shutdown.target -Before=sysinit.target shutdown.target -ConditionPathExists=!/run/systemd/readahead/cancel -ConditionPathExists=!/run/systemd/readahead/done -ConditionVirtualization=no - -[Service] -Type=notify -ExecStart=@rootlibexecdir@/systemd-readahead collect -RemainAfterExit=yes -StandardOutput=null -OOMScoreAdjust=1000 - -[Install] -WantedBy=default.target -Also=systemd-readahead-drop.service diff --git a/units/systemd-readahead-done.service.in b/units/systemd-readahead-done.service.in deleted file mode 100644 index e0d9579449..0000000000 --- a/units/systemd-readahead-done.service.in +++ /dev/null @@ -1,22 +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=Stop Read-Ahead Data Collection -Documentation=man:systemd-readahead-replay.service(8) -DefaultDependencies=no -Conflicts=shutdown.target -After=default.target -Before=shutdown.target -ConditionVirtualization=no - -[Service] -Type=oneshot -ExecStart=@SYSTEMD_NOTIFY@ --readahead=done - -[Install] -Also=systemd-readahead-collect.service diff --git a/units/systemd-readahead-done.timer b/units/systemd-readahead-done.timer deleted file mode 100644 index c58e09616e..0000000000 --- a/units/systemd-readahead-done.timer +++ /dev/null @@ -1,22 +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=Stop Read-Ahead Data Collection 10s After Completed Startup -Documentation=man:systemd-readahead-replay.service(8) -DefaultDependencies=no -Conflicts=shutdown.target -After=default.target -Before=shutdown.target -ConditionVirtualization=no - -[Timer] -OnActiveSec=30s -AccuracySec=1s - -[Install] -Also=systemd-readahead-collect.service diff --git a/units/systemd-readahead-drop.service b/units/systemd-readahead-drop.service deleted file mode 100644 index d9d12bc533..0000000000 --- a/units/systemd-readahead-drop.service +++ /dev/null @@ -1,19 +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=Drop Read-Ahead Data -Documentation=man:systemd-readahead-replay.service(8) -ConditionPathExists=/.readahead - -[Service] -Type=oneshot -ExecStart=/bin/rm -f /.readahead - -[Install] -WantedBy=system-update.target -Also=systemd-readahead-collect.service diff --git a/units/systemd-readahead-replay.service.in b/units/systemd-readahead-replay.service.in deleted file mode 100644 index c64a533e4e..0000000000 --- a/units/systemd-readahead-replay.service.in +++ /dev/null @@ -1,26 +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=Replay Read-Ahead Data -Documentation=man:systemd-readahead-replay.service(8) -DefaultDependencies=no -Conflicts=shutdown.target -Before=sysinit.target shutdown.target -ConditionPathExists=!/run/systemd/readahead/noreplay -ConditionPathExists=/.readahead -ConditionVirtualization=no - -[Service] -Type=notify -ExecStart=@rootlibexecdir@/systemd-readahead replay -RemainAfterExit=yes -StandardOutput=null -OOMScoreAdjust=1000 - -[Install] -WantedBy=default.target diff --git a/units/systemd-remount-fs.service.in b/units/systemd-remount-fs.service.in index 70e1a8680a..8d9daacaa5 100644 --- a/units/systemd-remount-fs.service.in +++ b/units/systemd-remount-fs.service.in @@ -11,7 +11,7 @@ Documentation=man:systemd-remount-fs.service(8) Documentation=http://www.freedesktop.org/wiki/Software/systemd/APIFileSystems DefaultDependencies=no Conflicts=shutdown.target -After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-fsck-root.service +After=systemd-fsck-root.service Before=local-fs-pre.target local-fs.target shutdown.target Wants=local-fs-pre.target ConditionPathExists=/etc/fstab diff --git a/units/systemd-rfkill@.service.in b/units/systemd-rfkill@.service.in index 9d264a2bca..0e9851bf2e 100644 --- a/units/systemd-rfkill@.service.in +++ b/units/systemd-rfkill@.service.in @@ -11,7 +11,7 @@ Documentation=man:systemd-rfkill@.service(8) DefaultDependencies=no RequiresMountsFor=/var/lib/systemd/rfkill Conflicts=shutdown.target -After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service +After=systemd-remount-fs.service Before=sysinit.target shutdown.target [Service] diff --git a/units/systemd-sysctl.service.in b/units/systemd-sysctl.service.in index ade9dc3007..fa72085f9e 100644 --- a/units/systemd-sysctl.service.in +++ b/units/systemd-sysctl.service.in @@ -10,7 +10,6 @@ Description=Apply Kernel Variables Documentation=man:systemd-sysctl.service(8) man:sysctl.d(5) DefaultDependencies=no Conflicts=shutdown.target -After=systemd-readahead-collect.service systemd-readahead-replay.service After=systemd-modules-load.service Before=sysinit.target shutdown.target ConditionPathIsReadWrite=/proc/sys/ diff --git a/units/systemd-sysusers.service.in b/units/systemd-sysusers.service.in index 69fea11fb1..ffd6d7747b 100644 --- a/units/systemd-sysusers.service.in +++ b/units/systemd-sysusers.service.in @@ -10,7 +10,7 @@ Description=Create System Users Documentation=man:sysusers.d(5) man:systemd-sysusers.service(8) DefaultDependencies=no Conflicts=shutdown.target -After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service +After=systemd-remount-fs.service Before=sysinit.target shutdown.target systemd-update-done.service ConditionNeedsUpdate=/etc diff --git a/units/systemd-tmpfiles-clean.service.in b/units/systemd-tmpfiles-clean.service.in index 31b2378410..133c8c94c4 100644 --- a/units/systemd-tmpfiles-clean.service.in +++ b/units/systemd-tmpfiles-clean.service.in @@ -10,7 +10,7 @@ Description=Cleanup of Temporary Directories Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8) DefaultDependencies=no Conflicts=shutdown.target -After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target time-sync.target +After=local-fs.target time-sync.target Before=shutdown.target [Service] diff --git a/units/systemd-tmpfiles-setup-dev.service.in b/units/systemd-tmpfiles-setup-dev.service.in index 06346d3b7c..f3833fdfd5 100644 --- a/units/systemd-tmpfiles-setup-dev.service.in +++ b/units/systemd-tmpfiles-setup-dev.service.in @@ -10,7 +10,7 @@ Description=Create Static Device Nodes in /dev Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8) DefaultDependencies=no Conflicts=shutdown.target -After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-sysusers.service +After=systemd-sysusers.service Before=sysinit.target local-fs-pre.target systemd-udevd.service shutdown.target ConditionCapability=CAP_SYS_MODULE diff --git a/units/systemd-tmpfiles-setup.service.in b/units/systemd-tmpfiles-setup.service.in index 72ab083d54..e895cda0e6 100644 --- a/units/systemd-tmpfiles-setup.service.in +++ b/units/systemd-tmpfiles-setup.service.in @@ -10,7 +10,7 @@ Description=Create Volatile Files and Directories Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8) DefaultDependencies=no Conflicts=shutdown.target -After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target systemd-sysusers.service +After=local-fs.target systemd-sysusers.service Before=sysinit.target shutdown.target RefuseManualStop=yes diff --git a/units/systemd-udev-hwdb-update.service.in b/units/systemd-udev-hwdb-update.service.in index 153d93c7e5..cdbcd837cd 100644 --- a/units/systemd-udev-hwdb-update.service.in +++ b/units/systemd-udev-hwdb-update.service.in @@ -10,7 +10,7 @@ Description=Rebuild Hardware Database Documentation=man:udev(7) man:systemd-udevd.service(8) DefaultDependencies=no Conflicts=shutdown.target -After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service +After=systemd-remount-fs.service Before=sysinit.target shutdown.target systemd-update-done.service ConditionNeedsUpdate=/etc diff --git a/units/systemd-update-done.service.in b/units/systemd-update-done.service.in index 7031bff614..ec7d906392 100644 --- a/units/systemd-update-done.service.in +++ b/units/systemd-update-done.service.in @@ -10,7 +10,7 @@ Description=Update is Completed Documentation=man:systemd-update-done.service(8) DefaultDependencies=no Conflicts=shutdown.target -After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target +After=local-fs.target Before=sysinit.target shutdown.target ConditionNeedsUpdate=|/etc ConditionNeedsUpdate=|/var diff --git a/units/systemd-update-utmp.service.in b/units/systemd-update-utmp.service.in index da7dda76ba..163eccd91f 100644 --- a/units/systemd-update-utmp.service.in +++ b/units/systemd-update-utmp.service.in @@ -11,7 +11,7 @@ Documentation=man:systemd-update-utmp.service(8) man:utmp(5) DefaultDependencies=no RequiresMountsFor=/var/log/wtmp Conflicts=shutdown.target -After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service +After=systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service Before=sysinit.target shutdown.target [Service] diff --git a/units/systemd-vconsole-setup.service.in b/units/systemd-vconsole-setup.service.in index 18faa63f28..6160361871 100644 --- a/units/systemd-vconsole-setup.service.in +++ b/units/systemd-vconsole-setup.service.in @@ -10,7 +10,6 @@ Description=Setup Virtual Console Documentation=man:systemd-vconsole-setup.service(8) man:vconsole.conf(5) DefaultDependencies=no Conflicts=shutdown.target -After=systemd-readahead-collect.service systemd-readahead-replay.service Before=sysinit.target shutdown.target ConditionPathExists=/dev/tty0 -- cgit v1.2.3-54-g00ecf