diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-05-23 04:02:56 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-05-23 04:02:56 +0200 |
| commit | 8d59c9b490a60da839c6975ee53c22b5fce2384c (patch) | |
| tree | 0bba238cae843d18320a0220fd2452ded89c3196 | |
| parent | 7b63bde1ed0d4f30c799c9b4737fa926465929f9 (diff) | |
readahead: use Conflicts= instead of masking to get rid of readahead units
| -rw-r--r-- | src/system-update-generator/system-update-generator.c | 13 | ||||
| -rw-r--r-- | units/system-update.target | 2 |
2 files changed, 1 insertions, 14 deletions
diff --git a/src/system-update-generator/system-update-generator.c b/src/system-update-generator/system-update-generator.c index d148550e7c..abda5a0190 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 5f638792d1..381f3f9a6a 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 |