X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fdbus-manager.c;h=b934624defd07d71abdbf21338bb80651d454437;hp=6002d02c5bb50e8a2b0c113086104344e8e46c58;hb=486cd82c8f7642016895b72bcc09a1bfe885a783;hpb=1302759d1581a4df0259cd4499a0908dad5f8b77

diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index 6002d02c5..b934624de 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -1121,7 +1121,7 @@ static int method_switch_root(sd_bus *bus, sd_bus_message *message, void *userda
         if (!isempty(init)) {
                 ri = strdup(init);
                 if (!ri) {
-                        free(ri);
+                        free(rt);
                         return -ENOMEM;
                 }
         }
@@ -1132,6 +1132,8 @@ static int method_switch_root(sd_bus *bus, sd_bus_message *message, void *userda
         free(m->switch_root_init);
         m->switch_root_init = ri;
 
+        m->exit_code = MANAGER_SWITCH_ROOT;
+
         return sd_bus_reply_method_return(message, NULL);
 }
 
@@ -1532,7 +1534,7 @@ const sd_bus_vtable bus_manager_vtable[] = {
         SD_BUS_PROPERTY("Tainted", "s", property_get_tainted, 0, 0),
         BUS_PROPERTY_DUAL_TIMESTAMP("FirmwareTimestamp", offsetof(Manager, firmware_timestamp), 0),
         BUS_PROPERTY_DUAL_TIMESTAMP("LoaderTimestamp", offsetof(Manager, loader_timestamp), 0),
-        BUS_PROPERTY_DUAL_TIMESTAMP("KernelTimestamp", offsetof(Manager, firmware_timestamp), 0),
+        BUS_PROPERTY_DUAL_TIMESTAMP("KernelTimestamp", offsetof(Manager, kernel_timestamp), 0),
         BUS_PROPERTY_DUAL_TIMESTAMP("InitRDTimestamp", offsetof(Manager, initrd_timestamp), 0),
         BUS_PROPERTY_DUAL_TIMESTAMP("UserspaceTimestamp", offsetof(Manager, userspace_timestamp), 0),
         BUS_PROPERTY_DUAL_TIMESTAMP("FinishTimestamp", offsetof(Manager, finish_timestamp), 0),
@@ -1622,7 +1624,7 @@ int bus_manager_foreach_client(Manager *m, int (*send_message)(sd_bus *bus, cons
         Iterator i;
         sd_bus *b;
         unsigned n;
-        int r;
+        int r, ret;
 
         n = set_size(m->subscribed);
         if (n <= 0)
@@ -1634,17 +1636,22 @@ int bus_manager_foreach_client(Manager *m, int (*send_message)(sd_bus *bus, cons
                 return send_message(d->bus, isempty(d->name) ? NULL : d->name, userdata);
         }
 
+        ret = 0;
+
         /* Send to everybody */
         SET_FOREACH(b, m->private_buses, i) {
                 r = send_message(b, NULL, userdata);
                 if (r < 0)
-                        return r;
+                        ret = r;
         }
 
-        if (m->api_bus)
-                return send_message(m->api_bus, NULL, userdata);
+        if (m->api_bus) {
+                r = send_message(m->api_bus, NULL, userdata);
+                if (r < 0)
+                        ret = r;
+        }
 
-        return 0;
+        return ret;
 }
 
 static int send_finished(sd_bus *bus, const char *destination, void *userdata) {
@@ -1666,7 +1673,7 @@ static int send_finished(sd_bus *bus, const char *destination, void *userdata) {
         return sd_bus_send_to(bus, message, destination, NULL);
 }
 
-int bus_manager_send_finished(
+void bus_manager_send_finished(
                 Manager *m,
                 usec_t firmware_usec,
                 usec_t loader_usec,
@@ -1675,10 +1682,14 @@ int bus_manager_send_finished(
                 usec_t userspace_usec,
                 usec_t total_usec) {
 
+        int r;
+
         assert(m);
 
-        return bus_manager_foreach_client(m, send_finished,
-                        (usec_t[6]) { firmware_usec, loader_usec, kernel_usec, initrd_usec, userspace_usec, total_usec });
+        r = bus_manager_foreach_client(m, send_finished,
+                                   (usec_t[6]) { firmware_usec, loader_usec, kernel_usec, initrd_usec, userspace_usec, total_usec });
+        if (r < 0)
+                log_debug("Failed to send finished signal: %s", strerror(-r));
 }
 
 static int send_reloading(sd_bus *bus, const char *destination, void *userdata) {
@@ -1698,8 +1709,13 @@ static int send_reloading(sd_bus *bus, const char *destination, void *userdata)
         return sd_bus_send_to(bus, message, destination, NULL);
 }
 
-int bus_manager_send_reloading(Manager *m, bool active) {
+void bus_manager_send_reloading(Manager *m, bool active) {
+        int r;
+
         assert(m);
 
-        return bus_manager_foreach_client(m, send_reloading, INT_TO_PTR(active));
+        r = bus_manager_foreach_client(m, send_reloading, INT_TO_PTR(active));
+        if (r < 0)
+                log_debug("Failed to send reloading signal: %s", strerror(-r));
+
 }