When installing or deinstalling, it is needed to
issue a "systemctl (--user) restart sockets.target"
This patch implement it on user side.
To be improved.
Change-Id: I152eb6a1cf5df50b1fe3143837d6d42ee6619349
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
{
/* enforce daemon reload */
systemd_daemon_reload(1);
{
/* enforce daemon reload */
systemd_daemon_reload(1);
+ systemd_unit_restart_name(1, "sockets.target");
/* update the database */
#ifdef LEGACY_MODE_WITHOUT_SYSTEMD
/* update the database */
#ifdef LEGACY_MODE_WITHOUT_SYSTEMD
static const char sdbi_service[] = "org.freedesktop.systemd1.Service";
static const char sdbm_reload[] = "Reload";
static const char sdbm_start_unit[] = "StartUnit";
static const char sdbi_service[] = "org.freedesktop.systemd1.Service";
static const char sdbm_reload[] = "Reload";
static const char sdbm_start_unit[] = "StartUnit";
+static const char sdbm_restart_unit[] = "RestartUnit";
static const char sdbm_stop_unit[] = "StopUnit";
static const char sdbm_start[] = "Start";
static const char sdbm_stop_unit[] = "StopUnit";
static const char sdbm_start[] = "Start";
+static const char sdbm_restart[] = "Restart";
static const char sdbm_stop[] = "Stop";
static const char sdbm_get_unit[] = "GetUnit";
static const char sdbm_get_unit_by_pid[] = "GetUnitByPID";
static const char sdbm_stop[] = "Stop";
static const char sdbm_get_unit[] = "GetUnit";
static const char sdbm_get_unit_by_pid[] = "GetUnitByPID";
+static int unit_restart(struct sd_bus *bus, const char *dpath)
+{
+ int rc;
+ struct sd_bus_message *ret = NULL;
+ sd_bus_error err = SD_BUS_ERROR_NULL;
+
+ rc = sd_bus_call_method(bus, sdb_destination, dpath, sdbi_unit, sdbm_restart, &err, &ret, "s", "replace");
+ sd_bus_message_unref(ret);
+ return rc;
+}
+
static int unit_stop(struct sd_bus *bus, const char *dpath)
{
int rc;
static int unit_stop(struct sd_bus *bus, const char *dpath)
{
int rc;
+static int unit_restart_name(struct sd_bus *bus, const char *name)
+{
+ int rc;
+ struct sd_bus_message *ret = NULL;
+ sd_bus_error err = SD_BUS_ERROR_NULL;
+
+ rc = sd_bus_call_method(bus, sdb_destination, sdb_path, sdbi_manager, sdbm_restart_unit, &err, &ret, "ss", name, "replace");
+ sd_bus_message_unref(ret);
+ return rc;
+}
+
static int unit_stop_name(struct sd_bus *bus, const char *name)
{
int rc;
static int unit_stop_name(struct sd_bus *bus, const char *name)
{
int rc;
return rc < 0 ? rc : unit_start(bus, dpath);
}
return rc < 0 ? rc : unit_start(bus, dpath);
}
+int systemd_unit_restart_dpath(int isuser, const char *dpath)
+{
+ int rc;
+ struct sd_bus *bus;
+
+ rc = get_bus(isuser, &bus);
+ return rc < 0 ? rc : unit_restart(bus, dpath);
+}
+
int systemd_unit_stop_dpath(int isuser, const char *dpath)
{
int rc;
int systemd_unit_stop_dpath(int isuser, const char *dpath)
{
int rc;
+int systemd_unit_restart_name(int isuser, const char *name)
+{
+ int rc;
+ struct sd_bus *bus;
+
+ rc = get_bus(isuser, &bus);
+ if (rc >= 0)
+ rc = unit_restart_name(bus, name);
+ return rc;
+}
+
int systemd_unit_stop_name(int isuser, const char *name)
{
int rc;
int systemd_unit_stop_name(int isuser, const char *name)
{
int rc;
extern char *systemd_unit_dpath_by_pid(int isuser, unsigned pid);
extern int systemd_unit_start_dpath(int isuser, const char *dpath);
extern char *systemd_unit_dpath_by_pid(int isuser, unsigned pid);
extern int systemd_unit_start_dpath(int isuser, const char *dpath);
+extern int systemd_unit_restart_dpath(int isuser, const char *dpath);
extern int systemd_unit_stop_dpath(int isuser, const char *dpath);
extern int systemd_unit_start_name(int isuser, const char *name);
extern int systemd_unit_stop_dpath(int isuser, const char *dpath);
extern int systemd_unit_start_name(int isuser, const char *name);
+extern int systemd_unit_restart_name(int isuser, const char *name);
extern int systemd_unit_stop_name(int isuser, const char *name);
extern int systemd_unit_stop_pid(int isuser, unsigned pid);
extern int systemd_unit_stop_name(int isuser, const char *name);
extern int systemd_unit_stop_pid(int isuser, unsigned pid);