From: Marius Vlad <marius.vlad@collabora.com>
Date: Thu, 24 Jun 2021 09:04:47 +0000 (+0200)
Subject: compositor: Avoid loading systemd-notify plug-in
X-Git-Tag: 12.0.1^0
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=bd4c81d5f90d466df8019d19dca4856aa7a5fa80;p=src%2Fagl-compositor.git

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
---

diff --git a/src/compositor.c b/src/compositor.c
index 4ee4dc3..c8f9e60 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;