From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 8 Jul 2010 03:29:46 +0000 (+0200)
Subject: service: don't enable native services via legacy sysv symlinks anymore
X-Git-Tag: v2~16
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=f8820b628ce41047eb4fa65ce0cd7760991c3db7

service: don't enable native services via legacy sysv symlinks anymore
---

diff --git a/src/service.c b/src/service.c
index 2ca0c17ec..f173d8a2d 100644
--- a/src/service.c
+++ b/src/service.c
@@ -2565,6 +2565,13 @@ static int service_enumerate(Manager *m) {
                                 manager_dispatch_load_queue(m);
                                 service = unit_follow_merge(service);
 
+                                /* If this is a native service, rely
+                                 * on native ways to pull in a
+                                 * service, don't pull it in via sysv
+                                 * rcN.d links. */
+                                if (service->meta.fragment_path)
+                                        continue;
+
                                 if (de->d_name[0] == 'S') {
 
                                         if ((r = unit_add_two_dependencies_by_name_inverse(service, UNIT_AFTER, UNIT_WANTS, rcnd_table[i].target, NULL, true)) < 0)