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 d148550e7c93c14a3a61eb86eb54ceb627bc7610..abda5a0190e836892a2f995c5f2776019d67f4ec 100644 (file)
--- 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 5f638792d1a892695d5ae34013ec62693d459eff..381f3f9a6a24b8b40dd9ad38d76ec95c6aa63fe2 100644 (file)
--- 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