Bug-fix for functionfs-activation patches

Current Systemd Version (v219) uses old-style log. (no reworked log)

Change-Id: Ief2f19ba85df5cef37a40a80783e6a3899774f51

diff --git a/src/core/service.c b/src/core/service.c
index 298239d..b5bb1fd 100644 (file)
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -519,10 +519,10 @@ static int service_verify(Service *s) {
         }
 
         if (s->usb_function_descriptors && !s->usb_function_strings)
-                log_unit_warning(UNIT(s), "Service has USBFunctionDescriptors= setting, but no USBFunctionStrings=. Ignoring.");
+                log_unit_warning(UNIT(s)->id, "Service has USBFunctionDescriptors= setting, but no USBFunctionStrings=. Ignoring.");
 
         if (!s->usb_function_descriptors && s->usb_function_strings)
-                log_unit_warning(UNIT(s), "Service has USBFunctionStrings= setting, but no USBFunctionDescriptors=. Ignoring.");
+                log_unit_warning(UNIT(s)->id, "Service has USBFunctionStrings= setting, but no USBFunctionDescriptors=. Ignoring.");
 
         if (s->runtime_max_usec != USEC_INFINITY && s->type == SERVICE_ONESHOT)
                 log_unit_warning(UNIT(s), "MaxRuntimeSec= has no effect in combination with Type=oneshot. Ignoring.");

diff --git a/src/core/socket.c b/src/core/socket.c
index b8bf7cb..e69c910 100644 (file)
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -2459,7 +2459,7 @@ static int socket_deserialize_item(Unit *u, const char *key, const char *value,
                 SocketPort *p;
 
                 if (sscanf(value, "%i %n", &fd, &skip) < 1 || fd < 0 || !fdset_contains(fds, fd))
-                        log_unit_debug(u, "Failed to parse ffs value: %s", value);
+                        log_unit_debug(u->id, "Failed to parse ffs value: %s", value);
                 else {
 
                         LIST_FOREACH(port, p, s->ports)