From 8d59c9b490a60da839c6975ee53c22b5fce2384c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 23 May 2012 04:02:56 +0200 Subject: [PATCH 1/1] readahead: use Conflicts= instead of masking to get rid of readahead units --- .../system-update-generator.c | 13 ------------- units/system-update.target | 2 +- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/system-update-generator/system-update-generator.c b/src/system-update-generator/system-update-generator.c index d148550e7..abda5a019 100644 --- a/src/system-update-generator/system-update-generator.c +++ b/src/system-update-generator/system-update-generator.c @@ -60,19 +60,6 @@ static int generate_symlink(void) { free(p); - /* Also try to disable readahead, but don't try too hard */ - p = strappend(arg_dest, "/systemd-readahead-collect.service"); - if (p) { - symlink("/dev/null", p); - free(p); - } - - p = strappend(arg_dest, "/systemd-readahead-replay.service"); - if (p) { - symlink("/dev/null", p); - free(p); - } - return 0; } diff --git a/units/system-update.target b/units/system-update.target index 5f638792d..381f3f9a6 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) Requires=sysinit.target -Conflicts=shutdown.target +Conflicts=shutdown.target systemd-readahead-collect.service systemd-readahead-replay.service After=sysinit.target Before=shutdown.target AllowIsolate=yes -- 2.30.2