chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
83698d6
)
service: don't enable native services via legacy sysv symlinks anymore
author
Lennart Poettering
<lennart@poettering.net>
Thu, 8 Jul 2010 03:29:46 +0000
(
05:29
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 8 Jul 2010 03:29:46 +0000
(
05:29
+0200)
src/service.c
patch
|
blob
|
history
diff --git
a/src/service.c
b/src/service.c
index 2ca0c17ec221d096f4b1a618707901f6e4669396..f173d8a2d5e8636dbbe3c4d14faf888beaeef61f 100644
(file)
--- 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)