From: José Bollo <jose.bollo@iot.bzh>
Date: Fri, 23 Jun 2017 12:06:02 +0000 (+0200)
Subject: Fix daemon reload (to be improved)
X-Git-Tag: dab/3.99.2~5
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fapp-framework-main.git;a=commitdiff_plain;h=474616e64fe081a59ebdb7ee6d650778f318212a

Fix daemon reload (to be improved)

Change-Id: Ica099aa439e6c022de4982a58b0990065d932b0b
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
---

diff --git a/src/afm-user-daemon.c b/src/afm-user-daemon.c
index c75aadb..b20fe92 100644
--- a/src/afm-user-daemon.c
+++ b/src/afm-user-daemon.c
@@ -29,6 +29,7 @@
 #include "verbose.h"
 #include "utils-jbus.h"
 #include "utils-json.h"
+#include "utils-systemd.h"
 #include "afm.h"
 #include "afm-launch-mode.h"
 #ifdef LEGACY_MODE_WITHOUT_SYSTEMD
@@ -487,6 +488,9 @@ static void on_uninstall(struct sd_bus_message *smsg, const char *msg, void *unu
  */
 static void on_signal_changed(struct json_object *obj, void *unused)
 {
+	/* enforce daemon reload */
+	systemd_daemon_reload(1);
+
 	/* update the database */
 #ifdef LEGACY_MODE_WITHOUT_SYSTEMD
 	afm_db_update_applications(afdb);
diff --git a/src/wgtpkg-unit.c b/src/wgtpkg-unit.c
index 232c4ee..e6e67bf 100644
--- a/src/wgtpkg-unit.c
+++ b/src/wgtpkg-unit.c
@@ -497,7 +497,7 @@ static int do_send_reload(const struct generatedesc *desc)
 		reloadusr = systemd_daemon_reload(1);
 	if (reloadsys)
 		reloadsys = systemd_daemon_reload(0);
-	return reloadsys ? : reloadusr ? : 0;
+	return 0;
 }
 
 static int do_uninstall_units(void *closure, const struct generatedesc *desc)