summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-07-08 05:29:46 +0200
committerLennart Poettering <lennart@poettering.net>2010-07-08 05:29:46 +0200
commitf8820b628ce41047eb4fa65ce0cd7760991c3db7 (patch)
tree129b0b8745bbce440e5a8fef39180dea436ffee0
parent83698d60db0edeff364717c48b93b74036a17449 (diff)
service: don't enable native services via legacy sysv symlinks anymore
-rw-r--r--src/service.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/service.c b/src/service.c
index 2ca0c17ec2..f173d8a2d5 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)