summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Vlad <marius.vlad@collabora.com>2021-06-24 11:04:47 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2021-07-13 21:20:10 +0000
commitde7cdb0314af94939b8d57e10afc2a1553ae82da (patch)
tree06a1804f3881a88895483049e86ab99fb8badfdb
parentae60166cd931609a4f6467a62261bcfb63221ce5 (diff)
compositor: Avoid loading systemd-notify plug-in
This helps being compliant with the weston ini configuration file, and in the same time being able to load other necessary modules. Instead of creating a separate module for loading the systemd-notify do the same thing as xwayland and avoid any attempt of loading it if passed over the command line, or specified in the ini file. Bug-AGL: SPEC-4001 Signed-off-by: Marius Vlad <marius.vlad@collabora.com> Change-Id: I46018f2dff5599bb3acc7c7334e77437995d0588
-rw-r--r--src/compositor.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/compositor.c b/src/compositor.c
index 22c4979..14be511 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -1177,6 +1177,14 @@ load_modules(struct ivi_compositor *ivi, const char *modules,
continue;
}
+ if (strstr(buffer, "systemd-notify.so")) {
+ weston_log("systemd-notify plug-in already loaded!\n");
+ p = end;
+ while (*p == ',')
+ p++;
+ continue;
+ }
+
module_init = weston_load_module(buffer, "wet_module_init");
if (!module_init)
return -1;