[systemd-commits] src/system-update-generator units/system-update.target

[Lennart Poettering]

 src/system-update-generator/system-update-generator.c |   13 -------------
 units/system-update.target                            |    2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)

New commits:
commit 8d59c9b490a60da839c6975ee53c22b5fce2384c
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed May 23 04:02:56 2012 +0200

    readahead: use Conflicts= instead of masking to get rid of readahead units

diff --git a/src/system-update-generator/system-update-generator.c b/src/system-update-generator/system-update-generator.c
index d148550..abda5a0 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 5f63879..381f3f9 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