It corrrectly handles both positive and negative errno values.
r = on_ac_power();
if (r < 0) {
- log_error_errno(-r, "Failed to read AC status: %m");
+ log_error_errno(r, "Failed to read AC status: %m");
return EXIT_FAILURE;
}
fd = make_socket_fd(LOG_DEBUG, *address, SOCK_STREAM | (arg_accept*SOCK_CLOEXEC));
if (fd < 0) {
log_open();
- log_error_errno(-fd, "Failed to open '%s': %m", *address);
+ log_error_errno(fd, "Failed to open '%s': %m", *address);
return fd;
}
/* set the path */
r = generate_path(&var, filenames);
if (r < 0) {
- log_error_errno(-r, "Failed to generate unit load path: %m");
+ log_error_errno(r, "Failed to generate unit load path: %m");
return r;
}
r = manager_new(running_as, true, &m);
if (r < 0) {
- log_error_errno(-r, "Failed to initalize manager: %m");
+ log_error_errno(r, "Failed to initalize manager: %m");
return r;
}
r = manager_startup(m, serial, fdset);
if (r < 0) {
- log_error_errno(-r, "Failed to start manager: %m");
+ log_error_errno(r, "Failed to start manager: %m");
goto finish;
}
} else
k = manager_load_unit(m, NULL, *filename, &err, &units[count]);
if (k < 0) {
- log_error_errno(-k, "Failed to load %s: %m", *filename);
+ log_error_errno(k, "Failed to load %s: %m", *filename);
if (r == 0)
r = k;
} else
r = bus_open_transport_systemd(arg_transport, arg_host, arg_user, &bus);
if (r < 0) {
- log_error_errno(-r, "Failed to create bus connection: %m");
+ log_error_errno(r, "Failed to create bus connection: %m");
goto finish;
}
r = safe_atou(max_brightness_str, &max_brightness);
if (r < 0) {
- log_warning_errno(-r, "Failed to parse 'max_brightness' \"%s\": %m", max_brightness_str);
+ log_warning_errno(r, "Failed to parse 'max_brightness' \"%s\": %m", max_brightness_str);
return 0;
}
r = safe_atou(*value, &brightness);
if (r < 0) {
- log_warning_errno(-r, "Failed to parse brightness \"%s\": %m", *value);
+ log_warning_errno(r, "Failed to parse brightness \"%s\": %m", *value);
return;
}
if (r == -ENOENT)
return EXIT_SUCCESS;
- log_error_errno(-r, "Failed to read %s: %m", saved);
+ log_error_errno(r, "Failed to read %s: %m", saved);
return EXIT_FAILURE;
}
r = write_string_file(saved, value);
if (r < 0) {
- log_error_errno(-r, "Failed to write %s: %m", saved);
+ log_error_errno(r, "Failed to write %s: %m", saved);
return EXIT_FAILURE;
}
r = write_string_file("/proc/sys/fs/binfmt_misc/register", rule);
if (r < 0) {
- log_error_errno(-r, "Failed to add binary format: %m");
+ log_error_errno(r, "Failed to add binary format: %m");
return r;
}
if (ignore_enoent && r == -ENOENT)
return 0;
- log_error_errno(-r, "Failed to open file '%s', ignoring: %m", path);
+ log_error_errno(r, "Failed to open file '%s', ignoring: %m", path);
return r;
}
r = conf_files_list_nulstr(&files, ".conf", NULL, conf_file_dirs);
if (r < 0) {
- log_error_errno(-r, "Failed to enumerate binfmt.d files: %m");
+ log_error_errno(r, "Failed to enumerate binfmt.d files: %m");
goto finish;
}
}
n = loop_read(f, p + 10, BOOTCHART_MAX, false);
if (n < 0) {
- log_error_errno(-n, "Failed to read bootchart data: %m");
+ log_error_errno(n, "Failed to read bootchart data: %m");
close(f);
return;
}
r = sd_journal_sendv(iovec, j);
if (r < 0)
- log_error_errno(-r, "Failed to send bootchart: %m");
+ log_error_errno(r, "Failed to send bootchart: %m");
}
int main(int argc, char *argv[]) {
if (r == -EISDIR)
return r;
- log_error_errno(-r, "Failed to load %s: %m", path);
+ log_error_errno(r, "Failed to load %s: %m", path);
return r;
}
t = xml_tokenize(&q, &name, &xml_state, &line);
if (t < 0) {
- log_error_errno(-t, "XML parse failure in %s: %m", path);
+ log_error_errno(t, "XML parse failure in %s: %m", path);
return t;
}
r = get_user_creds(&u, &i->uid, NULL, NULL, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to resolve user %s, ignoring policy: %m", u);
+ log_error_errno(r, "Failed to resolve user %s, ignoring policy: %m", u);
free(i);
} else {
PolicyItem *first;
r = get_group_creds(&g, &i->gid);
if (r < 0) {
- log_error_errno(-r, "Failed to resolve group %s, ignoring policy: %m", g);
+ log_error_errno(r, "Failed to resolve group %s, ignoring policy: %m", g);
free(i);
} else {
PolicyItem *first;
r = get_user_creds(&u, &i->uid, NULL, NULL, NULL);
if (r < 0)
- log_error_errno(-r, "Failed to resolve user %s: %m", name);
+ log_error_errno(r, "Failed to resolve user %s: %m", name);
else
i->uid_valid = true;
}
r = get_group_creds(&g, &i->gid);
if (r < 0)
- log_error_errno(-r, "Failed to resolve group %s: %m", name);
+ log_error_errno(r, "Failed to resolve group %s: %m", name);
else
i->gid_valid = true;
}
r = conf_files_list(&l, ".conf", NULL, *i, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to get configuration file list: %m");
+ log_error_errno(r, "Failed to get configuration file list: %m");
return r;
}
r = sd_bus_message_new_method_return(m, &n);
if (r < 0) {
- log_error_errno(-r, "Failed to generate HELLO reply: %m");
+ log_error_errno(r, "Failed to generate HELLO reply: %m");
return r;
}
r = sd_bus_message_append(n, "s", a->unique_name);
if (r < 0) {
- log_error_errno(-r, "Failed to append unique name to HELLO reply: %m");
+ log_error_errno(r, "Failed to append unique name to HELLO reply: %m");
return r;
}
r = bus_message_append_sender(n, "org.freedesktop.DBus");
if (r < 0) {
- log_error_errno(-r, "Failed to append sender to HELLO reply: %m");
+ log_error_errno(r, "Failed to append sender to HELLO reply: %m");
return r;
}
r = bus_seal_synthetic_message(b, n);
if (r < 0) {
- log_error_errno(-r, "Failed to seal HELLO reply: %m");
+ log_error_errno(r, "Failed to seal HELLO reply: %m");
return r;
}
r = sd_bus_send(b, n, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to send HELLO reply: %m");
+ log_error_errno(r, "Failed to send HELLO reply: %m");
return r;
}
"org.freedesktop.DBus",
"NameAcquired");
if (r < 0) {
- log_error_errno(-r, "Failed to allocate initial NameAcquired message: %m");
+ log_error_errno(r, "Failed to allocate initial NameAcquired message: %m");
return r;
}
r = sd_bus_message_append(n, "s", a->unique_name);
if (r < 0) {
- log_error_errno(-r, "Failed to append unique name to NameAcquired message: %m");
+ log_error_errno(r, "Failed to append unique name to NameAcquired message: %m");
return r;
}
r = bus_message_append_sender(n, "org.freedesktop.DBus");
if (r < 0) {
- log_error_errno(-r, "Failed to append sender to NameAcquired message: %m");
+ log_error_errno(r, "Failed to append sender to NameAcquired message: %m");
return r;
}
r = bus_seal_synthetic_message(b, n);
if (r < 0) {
- log_error_errno(-r, "Failed to seal NameAcquired message: %m");
+ log_error_errno(r, "Failed to seal NameAcquired message: %m");
return r;
}
r = sd_bus_send(b, n, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to send NameAcquired message: %m");
+ log_error_errno(r, "Failed to send NameAcquired message: %m");
return r;
}
r = get_user_creds(&user, &uid, &gid, NULL, NULL);
if (r < 0) {
- log_error_errno(-r, "Cannot resolve user name %s: %m", user);
+ log_error_errno(r, "Cannot resolve user name %s: %m", user);
goto finish;
}
r = sd_bus_new(&a);
if (r < 0) {
- log_error_errno(-r, "Failed to allocate bus: %m");
+ log_error_errno(r, "Failed to allocate bus: %m");
goto finish;
}
r = sd_bus_set_description(a, "sd-proxy");
if (r < 0) {
- log_error_errno(-r, "Failed to set bus name: %m");
+ log_error_errno(r, "Failed to set bus name: %m");
goto finish;
}
r = sd_bus_set_address(a, arg_address);
if (r < 0) {
- log_error_errno(-r, "Failed to set address to connect to: %m");
+ log_error_errno(r, "Failed to set address to connect to: %m");
goto finish;
}
r = sd_bus_negotiate_fds(a, is_unix);
if (r < 0) {
- log_error_errno(-r, "Failed to set FD negotiation: %m");
+ log_error_errno(r, "Failed to set FD negotiation: %m");
goto finish;
}
r = sd_bus_negotiate_creds(a, true, SD_BUS_CREDS_UID|SD_BUS_CREDS_PID|SD_BUS_CREDS_GID|SD_BUS_CREDS_SELINUX_CONTEXT);
if (r < 0) {
- log_error_errno(-r, "Failed to set credential negotiation: %m");
+ log_error_errno(r, "Failed to set credential negotiation: %m");
goto finish;
}
r = sd_bus_start(a);
if (r < 0) {
- log_error_errno(-r, "Failed to start bus client: %m");
+ log_error_errno(r, "Failed to start bus client: %m");
goto finish;
}
r = sd_bus_get_owner_id(a, &server_id);
if (r < 0) {
- log_error_errno(-r, "Failed to get server ID: %m");
+ log_error_errno(r, "Failed to get server ID: %m");
goto finish;
}
r = sd_bus_get_owner_creds(a, SD_BUS_CREDS_UID, &bus_creds);
if (r < 0) {
- log_error_errno(-r, "Failed to get bus creds: %m");
+ log_error_errno(r, "Failed to get bus creds: %m");
goto finish;
}
r = sd_bus_creds_get_uid(bus_creds, &bus_uid);
if (r < 0) {
- log_error_errno(-r, "Failed to get bus owner UID: %m");
+ log_error_errno(r, "Failed to get bus owner UID: %m");
goto finish;
}
r = policy_load(&policy_buffer, arg_configuration);
if (r < 0) {
- log_error_errno(-r, "Failed to load policy: %m");
+ log_error_errno(r, "Failed to load policy: %m");
goto finish;
}
r = sd_bus_new(&b);
if (r < 0) {
- log_error_errno(-r, "Failed to allocate bus: %m");
+ log_error_errno(r, "Failed to allocate bus: %m");
goto finish;
}
r = sd_bus_set_fd(b, in_fd, out_fd);
if (r < 0) {
- log_error_errno(-r, "Failed to set fds: %m");
+ log_error_errno(r, "Failed to set fds: %m");
goto finish;
}
r = sd_bus_set_server(b, 1, server_id);
if (r < 0) {
- log_error_errno(-r, "Failed to set server mode: %m");
+ log_error_errno(r, "Failed to set server mode: %m");
goto finish;
}
r = sd_bus_negotiate_fds(b, is_unix);
if (r < 0) {
- log_error_errno(-r, "Failed to set FD negotiation: %m");
+ log_error_errno(r, "Failed to set FD negotiation: %m");
goto finish;
}
r = sd_bus_negotiate_creds(b, true, SD_BUS_CREDS_UID|SD_BUS_CREDS_PID|SD_BUS_CREDS_GID|SD_BUS_CREDS_SELINUX_CONTEXT);
if (r < 0) {
- log_error_errno(-r, "Failed to set credential negotiation: %m");
+ log_error_errno(r, "Failed to set credential negotiation: %m");
goto finish;
}
r = sd_bus_set_anonymous(b, true);
if (r < 0) {
- log_error_errno(-r, "Failed to set anonymous authentication: %m");
+ log_error_errno(r, "Failed to set anonymous authentication: %m");
goto finish;
}
r = sd_bus_start(b);
if (r < 0) {
- log_error_errno(-r, "Failed to start bus client: %m");
+ log_error_errno(r, "Failed to start bus client: %m");
goto finish;
}
r = rename_service(a, b);
if (r < 0)
- log_debug_errno(-r, "Failed to rename process: %m");
+ log_debug_errno(r, "Failed to rename process: %m");
if (a->is_kernel) {
_cleanup_free_ char *match = NULL;
r = sd_bus_get_unique_name(a, &unique);
if (r < 0) {
- log_error_errno(-r, "Failed to get unique name: %m");
+ log_error_errno(r, "Failed to get unique name: %m");
goto finish;
}
r = sd_bus_add_match(a, NULL, match, NULL, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to add match for NameLost: %m");
+ log_error_errno(r, "Failed to add match for NameLost: %m");
goto finish;
}
r = sd_bus_add_match(a, NULL, match, NULL, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to add match for NameAcquired: %m");
+ log_error_errno(r, "Failed to add match for NameAcquired: %m");
goto finish;
}
}
if (r == -ECONNRESET)
r = 0;
else
- log_error_errno(-r, "Failed to process bus a: %m");
+ log_error_errno(r, "Failed to process bus a: %m");
goto finish;
}
k = synthesize_name_acquired(a, b, m);
if (k < 0) {
r = k;
- log_error_errno(-r, "Failed to synthesize message: %m");
+ log_error_errno(r, "Failed to synthesize message: %m");
goto finish;
}
k = process_policy(a, b, m, policy, &ucred, owned_names);
if (k < 0) {
r = k;
- log_error_errno(-r, "Failed to process policy: %m");
+ log_error_errno(r, "Failed to process policy: %m");
goto finish;
} else if (k > 0) {
r = 1;
r = 0;
else {
r = k;
- log_error_errno(-r, "Failed to send message to client: %m");
+ log_error_errno(r, "Failed to send message to client: %m");
}
goto finish;
if (r == -ECONNRESET)
r = 0;
else
- log_error_errno(-r, "Failed to process bus b: %m");
+ log_error_errno(r, "Failed to process bus b: %m");
goto finish;
}
k = process_hello(a, b, m, &got_hello);
if (k < 0) {
r = k;
- log_error_errno(-r, "Failed to process HELLO: %m");
+ log_error_errno(r, "Failed to process HELLO: %m");
goto finish;
} else if (k > 0) {
processed = true;
k = process_driver(a, b, m, policy, &ucred, owned_names);
if (k < 0) {
r = k;
- log_error_errno(-r, "Failed to process driver calls: %m");
+ log_error_errno(r, "Failed to process driver calls: %m");
goto finish;
} else if (k > 0) {
processed = true;
k = process_policy(b, a, m, policy, &ucred, owned_names);
if (k < 0) {
r = k;
- log_error_errno(-r, "Failed to process policy: %m");
+ log_error_errno(r, "Failed to process policy: %m");
goto finish;
} else if (k > 0) {
processed = true;
r = 0;
else {
r = k;
- log_error_errno(-r, "Failed to send message to bus: %m");
+ log_error_errno(r, "Failed to send message to bus: %m");
}
goto finish;
fd = sd_bus_get_fd(a);
if (fd < 0) {
- log_error_errno(-r, "Failed to get fd: %m");
+ log_error_errno(r, "Failed to get fd: %m");
goto finish;
}
events_a = sd_bus_get_events(a);
if (events_a < 0) {
- log_error_errno(-r, "Failed to get events mask: %m");
+ log_error_errno(r, "Failed to get events mask: %m");
goto finish;
}
r = sd_bus_get_timeout(a, &timeout_a);
if (r < 0) {
- log_error_errno(-r, "Failed to get timeout: %m");
+ log_error_errno(r, "Failed to get timeout: %m");
goto finish;
}
events_b = sd_bus_get_events(b);
if (events_b < 0) {
- log_error_errno(-r, "Failed to get events mask: %m");
+ log_error_errno(r, "Failed to get events mask: %m");
goto finish;
}
r = sd_bus_get_timeout(b, &timeout_b);
if (r < 0) {
- log_error_errno(-r, "Failed to get timeout: %m");
+ log_error_errno(r, "Failed to get timeout: %m");
goto finish;
}
r = bus_open_transport(BUS_TRANSPORT_LOCAL, NULL, false, &bus);
if (r < 0) {
- log_error_errno(-r, "Failed to create bus connection: %m");
+ log_error_errno(r, "Failed to create bus connection: %m");
goto finish;
}
m = strappenda("/run/systemd/machines/", arg_machine);
r = parse_env_file(m, NEWLINE, "SCOPE", &scope, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to get machine path: %m");
+ log_error_errno(r, "Failed to get machine path: %m");
goto finish;
}
}
if (r < 0) {
- log_error_errno(-r, "Failed to list cgroup tree %s: %m", root);
+ log_error_errno(r, "Failed to list cgroup tree %s: %m", root);
retval = EXIT_FAILURE;
} else
retval = EXIT_SUCCESS;
/* If we couldn't connect we assume this was triggered
* while systemd got restarted/transitioned from
* initrd to the system, so let's ignore this */
- log_debug_errno(-r, "Failed to get D-Bus connection: %m");
+ log_debug_errno(r, "Failed to get D-Bus connection: %m");
return EXIT_FAILURE;
}
"Released",
"s", argv[1]);
if (r < 0) {
- log_debug_errno(-r, "Failed to send signal message on private connection: %m");
+ log_debug_errno(r, "Failed to send signal message on private connection: %m");
return EXIT_FAILURE;
}
if (r == -ETIMEDOUT)
continue;
if (r < 0) {
- log_error_errno(-r, "Couldn't read key: %m");
+ log_error_errno(r, "Couldn't read key: %m");
goto finish;
}
}
group_hashmap_free(b);
if (r < 0) {
- log_error_errno(-r, "Exiting with failure: %m");
+ log_error_errno(r, "Exiting with failure: %m");
return EXIT_FAILURE;
}
r = sd_event_source_set_enabled(s->redraw_src, SD_EVENT_ONESHOT);
if (r < 0)
- log_error_errno(-r, "Cannot enable redraw-source: %m");
+ log_error_errno(r, "Cannot enable redraw-source: %m");
}
void session_add_device(Session *s, sysview_device *device) {
case PTY_DATA:
r = term_screen_feed_text(t->screen, ptr, size);
if (r < 0)
- log_error_errno(-r, "Cannot update screen state: %m");
+ log_error_errno(r, "Cannot update screen state: %m");
workspace_dirty(t->workspace);
break;
if (t->pty) {
r = pty_resize(t->pty, width, height);
if (r < 0)
- log_error_errno(-r, "Cannot resize pty: %m");
+ log_error_errno(r, "Cannot resize pty: %m");
}
r = term_screen_resize(t->screen, width, height);
if (r < 0)
- log_error_errno(-r, "Cannot resize screen: %m");
+ log_error_errno(r, "Cannot resize screen: %m");
}
void terminal_run(Terminal *t) {
term_screen_get_width(t->screen),
term_screen_get_height(t->screen));
if (pid < 0) {
- log_error_errno(-pid, "Cannot fork PTY: %m");
+ log_error_errno(pid, "Cannot fork PTY: %m");
return;
} else if (pid == 0) {
/* child */
r = manager_new(&m);
if (r < 0) {
- log_error_errno(-r, "Could not create manager: %m");
+ log_error_errno(r, "Could not create manager: %m");
goto out;
}
r = manager_run(m);
if (r < 0) {
- log_error_errno(-r, "Cannot run manager: %m");
+ log_error_errno(r, "Cannot run manager: %m");
goto out;
}
fail_child:
log_open();
- log_error_errno(-r, "Failed to create starter connection at step %s: %m", exit_status_to_string(ret, EXIT_STATUS_SYSTEMD));
+ log_error_errno(r, "Failed to create starter connection at step %s: %m", exit_status_to_string(ret, EXIT_STATUS_SYSTEMD));
_exit(ret);
}
/* First, create our own group */
r = cg_create_everywhere(u->manager->cgroup_supported, mask, u->cgroup_path);
if (r < 0) {
- log_error_errno(-r, "Failed to create cgroup %s: %m", u->cgroup_path);
+ log_error_errno(r, "Failed to create cgroup %s: %m", u->cgroup_path);
return r;
}
/* Then, possibly move things over */
r = cg_migrate_everywhere(u->manager->cgroup_supported, u->cgroup_path, u->cgroup_path, migrate_callback, u);
if (r < 0)
- log_warning_errno(-r, "Failed to migrate cgroup from to %s: %m", u->cgroup_path);
+ log_warning_errno(r, "Failed to migrate cgroup from to %s: %m", u->cgroup_path);
return 0;
}
r = unit_realize_cgroup_now(i, state);
if (r < 0)
- log_warning_errno(-r, "Failed to realize cgroups for queued unit %s: %m", i->id);
+ log_warning_errno(r, "Failed to realize cgroups for queued unit %s: %m", i->id);
n++;
}
r = cg_trim_everywhere(u->manager->cgroup_supported, u->cgroup_path, !unit_has_name(u, SPECIAL_ROOT_SLICE));
if (r < 0)
- log_debug_errno(-r, "Failed to destroy cgroup %s: %m", u->cgroup_path);
+ log_debug_errno(r, "Failed to destroy cgroup %s: %m", u->cgroup_path);
hashmap_remove(u->manager->cgroup_unit, u->cgroup_path);
r = cg_pid_get_path(SYSTEMD_CGROUP_CONTROLLER, 0, &m->cgroup_root);
if (r < 0) {
- log_error_errno(-r, "Cannot determine cgroup we are running in: %m");
+ log_error_errno(r, "Cannot determine cgroup we are running in: %m");
return r;
}
/* 2. Show data */
r = cg_get_path(SYSTEMD_CGROUP_CONTROLLER, m->cgroup_root, NULL, &path);
if (r < 0) {
- log_error_errno(-r, "Cannot find cgroup mount point: %m");
+ log_error_errno(r, "Cannot find cgroup mount point: %m");
return r;
}
if (m->running_as == SYSTEMD_SYSTEM) {
r = cg_install_release_agent(SYSTEMD_CGROUP_CONTROLLER, SYSTEMD_CGROUP_AGENT_PATH);
if (r < 0)
- log_warning_errno(-r, "Failed to install release agent, ignoring: %m");
+ log_warning_errno(r, "Failed to install release agent, ignoring: %m");
else if (r > 0)
log_debug("Installed release agent.");
else
/* 4. Make sure we are in the root cgroup */
r = cg_create_and_attach(SYSTEMD_CGROUP_CONTROLLER, m->cgroup_root, 0);
if (r < 0) {
- log_error_errno(-r, "Failed to create root cgroup hierarchy: %m");
+ log_error_errno(r, "Failed to create root cgroup hierarchy: %m");
return r;
}
r = bus_foreach_bus(j->manager, j->clients, j->sent_dbus_new_signal ? send_changed_signal : send_new_signal, j);
if (r < 0)
- log_debug_errno(-r, "Failed to send job change signal for %u: %m", j->id);
+ log_debug_errno(r, "Failed to send job change signal for %u: %m", j->id);
j->sent_dbus_new_signal = true;
}
r = bus_foreach_bus(j->manager, j->clients, send_removed_signal, j);
if (r < 0)
- log_debug_errno(-r, "Failed to send job remove signal for %u: %m", j->id);
+ log_debug_errno(r, "Failed to send job remove signal for %u: %m", j->id);
}
if (n_changes > 0) {
r = bus_foreach_bus(m, NULL, send_unit_files_changed, NULL);
if (r < 0)
- log_debug_errno(-r, "Failed to send UnitFilesChanged signal: %m");
+ log_debug_errno(r, "Failed to send UnitFilesChanged signal: %m");
}
r = sd_bus_message_new_method_return(message, &reply);
total_usec
});
if (r < 0)
- log_debug_errno(-r, "Failed to send finished signal: %m");
+ log_debug_errno(r, "Failed to send finished signal: %m");
}
static int send_reloading(sd_bus *bus, void *userdata) {
r = bus_foreach_bus(m, NULL, send_reloading, INT_TO_PTR(active));
if (r < 0)
- log_debug_errno(-r, "Failed to send reloading signal: %m");
+ log_debug_errno(r, "Failed to send reloading signal: %m");
}
r = bus_foreach_bus(u->manager, NULL, u->sent_dbus_new_signal ? send_changed_signal : send_new_signal, u);
if (r < 0)
- log_debug_errno(-r, "Failed to send unit change signal for %s: %m", u->id);
+ log_debug_errno(r, "Failed to send unit change signal for %s: %m", u->id);
u->sent_dbus_new_signal = true;
}
r = bus_foreach_bus(u->manager, NULL, send_removed_signal, u);
if (r < 0)
- log_debug_errno(-r, "Failed to send unit remove signal for %s: %m", u->id);
+ log_debug_errno(r, "Failed to send unit remove signal for %s: %m", u->id);
}
int bus_unit_queue_job(
r = sd_bus_send(m->queued_message_bus, m->queued_message, NULL);
if (r < 0)
- log_warning_errno(-r, "Failed to send queued message: %m");
+ log_warning_errno(r, "Failed to send queued message: %m");
m->queued_message = sd_bus_message_unref(m->queued_message);
m->queued_message_bus = sd_bus_unref(m->queued_message_bus);
r = sd_bus_send(m->system_bus, message, NULL);
if (r < 0)
- log_warning_errno(-r, "Failed to forward Released message: %m");
+ log_warning_errno(r, "Failed to forward Released message: %m");
}
return 0;
r = sd_bus_send_to(bus, reply, "org.freedesktop.DBus", NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to respond with to bus activation request: %m");
+ log_error_errno(r, "Failed to respond with to bus activation request: %m");
return r;
}
#ifdef HAVE_SELINUX
r = sd_bus_add_filter(bus, NULL, mac_selinux_filter, m);
if (r < 0) {
- log_error_errno(-r, "Failed to add SELinux access filter: %m");
+ log_error_errno(r, "Failed to add SELinux access filter: %m");
return r;
}
#endif
r = sd_bus_add_object_vtable(bus, NULL, "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", bus_manager_vtable, m);
if (r < 0) {
- log_error_errno(-r, "Failed to register Manager vtable: %m");
+ log_error_errno(r, "Failed to register Manager vtable: %m");
return r;
}
r = sd_bus_add_fallback_vtable(bus, NULL, "/org/freedesktop/systemd1/job", "org.freedesktop.systemd1.Job", bus_job_vtable, bus_job_find, m);
if (r < 0) {
- log_error_errno(-r, "Failed to register Job vtable: %m");
+ log_error_errno(r, "Failed to register Job vtable: %m");
return r;
}
r = sd_bus_add_node_enumerator(bus, NULL, "/org/freedesktop/systemd1/job", bus_job_enumerate, m);
if (r < 0) {
- log_error_errno(-r, "Failed to add job enumerator: %m");
+ log_error_errno(r, "Failed to add job enumerator: %m");
return r;
}
r = sd_bus_add_fallback_vtable(bus, NULL, "/org/freedesktop/systemd1/unit", "org.freedesktop.systemd1.Unit", bus_unit_vtable, bus_unit_find, m);
if (r < 0) {
- log_error_errno(-r, "Failed to register Unit vtable: %m");
+ log_error_errno(r, "Failed to register Unit vtable: %m");
return r;
}
r = sd_bus_add_node_enumerator(bus, NULL, "/org/freedesktop/systemd1/unit", bus_unit_enumerate, m);
if (r < 0) {
- log_error_errno(-r, "Failed to add job enumerator: %m");
+ log_error_errno(r, "Failed to add job enumerator: %m");
return r;
}
for (t = 0; t < _UNIT_TYPE_MAX; t++) {
r = sd_bus_add_fallback_vtable(bus, NULL, "/org/freedesktop/systemd1/unit", unit_vtable[t]->bus_interface, unit_vtable[t]->bus_vtable, bus_unit_interface_find, m);
if (r < 0) {
- log_error_errno(-r, "Failed to register type specific vtable for %s: %m", unit_vtable[t]->bus_interface);
+ log_error_errno(r, "Failed to register type specific vtable for %s: %m", unit_vtable[t]->bus_interface);
return r;
}
if (unit_vtable[t]->cgroup_context_offset > 0) {
r = sd_bus_add_fallback_vtable(bus, NULL, "/org/freedesktop/systemd1/unit", unit_vtable[t]->bus_interface, bus_unit_cgroup_vtable, bus_unit_cgroup_find, m);
if (r < 0) {
- log_error_errno(-r, "Failed to register control group unit vtable for %s: %m", unit_vtable[t]->bus_interface);
+ log_error_errno(r, "Failed to register control group unit vtable for %s: %m", unit_vtable[t]->bus_interface);
return r;
}
r = sd_bus_add_fallback_vtable(bus, NULL, "/org/freedesktop/systemd1/unit", unit_vtable[t]->bus_interface, bus_cgroup_vtable, bus_cgroup_context_find, m);
if (r < 0) {
- log_error_errno(-r, "Failed to register control group vtable for %s: %m", unit_vtable[t]->bus_interface);
+ log_error_errno(r, "Failed to register control group vtable for %s: %m", unit_vtable[t]->bus_interface);
return r;
}
}
if (unit_vtable[t]->exec_context_offset > 0) {
r = sd_bus_add_fallback_vtable(bus, NULL, "/org/freedesktop/systemd1/unit", unit_vtable[t]->bus_interface, bus_exec_vtable, bus_exec_context_find, m);
if (r < 0) {
- log_error_errno(-r, "Failed to register execute vtable for %s: %m", unit_vtable[t]->bus_interface);
+ log_error_errno(r, "Failed to register execute vtable for %s: %m", unit_vtable[t]->bus_interface);
return r;
}
}
if (unit_vtable[t]->kill_context_offset > 0) {
r = sd_bus_add_fallback_vtable(bus, NULL, "/org/freedesktop/systemd1/unit", unit_vtable[t]->bus_interface, bus_kill_vtable, bus_kill_context_find, m);
if (r < 0) {
- log_error_errno(-r, "Failed to register kill vtable for %s: %m", unit_vtable[t]->bus_interface);
+ log_error_errno(r, "Failed to register kill vtable for %s: %m", unit_vtable[t]->bus_interface);
return r;
}
}
signal_disconnected, m);
if (r < 0) {
- log_error_errno(-r, "Failed to register match for Disconnected message: %m");
+ log_error_errno(r, "Failed to register match for Disconnected message: %m");
return r;
}
r = sd_bus_new(&bus);
if (r < 0) {
- log_warning_errno(-r, "Failed to allocate new private connection bus: %m");
+ log_warning_errno(r, "Failed to allocate new private connection bus: %m");
return 0;
}
r = sd_bus_set_fd(bus, nfd, nfd);
if (r < 0) {
- log_warning_errno(-r, "Failed to set fd on new connection bus: %m");
+ log_warning_errno(r, "Failed to set fd on new connection bus: %m");
return 0;
}
r = bus_check_peercred(bus);
if (r < 0) {
- log_warning_errno(-r, "Incoming private connection from unprivileged client, refusing: %m");
+ log_warning_errno(r, "Incoming private connection from unprivileged client, refusing: %m");
return 0;
}
r = sd_bus_set_server(bus, 1, id);
if (r < 0) {
- log_warning_errno(-r, "Failed to enable server support for new connection bus: %m");
+ log_warning_errno(r, "Failed to enable server support for new connection bus: %m");
return 0;
}
r = sd_bus_start(bus);
if (r < 0) {
- log_warning_errno(-r, "Failed to start new connection bus: %m");
+ log_warning_errno(r, "Failed to start new connection bus: %m");
return 0;
}
r = sd_bus_attach_event(bus, m->event, SD_EVENT_PRIORITY_NORMAL);
if (r < 0) {
- log_warning_errno(-r, "Failed to attach new connection bus to event loop: %m");
+ log_warning_errno(r, "Failed to attach new connection bus to event loop: %m");
return 0;
}
signal_agent_released, m);
if (r < 0) {
- log_warning_errno(-r, "Failed to register Released match on new connection bus: %m");
+ log_warning_errno(r, "Failed to register Released match on new connection bus: %m");
return 0;
}
}
r = bus_setup_api_vtables(m, bus);
if (r < 0) {
- log_warning_errno(-r, "Failed to set up API vtables on new connection bus: %m");
+ log_warning_errno(r, "Failed to set up API vtables on new connection bus: %m");
return 0;
}
r = set_put(m->private_buses, bus);
if (r < 0) {
- log_warning_errno(-r, "Failed to add new conenction bus to set: %m");
+ log_warning_errno(r, "Failed to add new conenction bus to set: %m");
return 0;
}
r = sd_bus_list_names(bus, &names, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to get initial list of names: %m");
+ log_error_errno(r, "Failed to get initial list of names: %m");
return r;
}
SD_BUS_CREDS_EUID|SD_BUS_CREDS_EFFECTIVE_CAPS|
SD_BUS_CREDS_SELINUX_CONTEXT);
if (r < 0)
- log_warning_errno(-r, "Failed to enable credential passing, ignoring: %m");
+ log_warning_errno(r, "Failed to enable credential passing, ignoring: %m");
r = bus_setup_api_vtables(m, bus);
if (r < 0)
"member='NameOwnerChanged'",
signal_name_owner_changed, m);
if (r < 0)
- log_warning_errno(-r, "Failed to subscribe to NameOwnerChanged signal: %m");
+ log_warning_errno(r, "Failed to subscribe to NameOwnerChanged signal: %m");
r = sd_bus_add_match(
bus,
"member='ActivationRequest'",
signal_activation_request, m);
if (r < 0)
- log_warning_errno(-r, "Failed to subscribe to activation signal: %m");
+ log_warning_errno(r, "Failed to subscribe to activation signal: %m");
/* Allow replacing of our name, to ease implementation of
* reexecution, where we keep the old connection open until
* finish */
r = sd_bus_request_name(bus,"org.freedesktop.systemd1", SD_BUS_NAME_REPLACE_EXISTING|SD_BUS_NAME_ALLOW_REPLACEMENT);
if (r < 0) {
- log_error_errno(-r, "Failed to register name: %m");
+ log_error_errno(r, "Failed to register name: %m");
return r;
}
r = sd_bus_attach_event(bus, m->event, SD_EVENT_PRIORITY_NORMAL);
if (r < 0) {
- log_error_errno(-r, "Failed to attach API bus to event loop: %m");
+ log_error_errno(r, "Failed to attach API bus to event loop: %m");
return 0;
}
r = bus_setup_api(m, bus);
if (r < 0) {
- log_error_errno(-r, "Failed to set up API bus: %m");
+ log_error_errno(r, "Failed to set up API bus: %m");
return 0;
}
signal_agent_released, m);
if (r < 0)
- log_warning_errno(-r, "Failed to register Released match on system bus: %m");
+ log_warning_errno(r, "Failed to register Released match on system bus: %m");
log_debug("Successfully connected to system bus.");
return 0;
r = sd_bus_attach_event(bus, m->event, SD_EVENT_PRIORITY_NORMAL);
if (r < 0) {
- log_error_errno(-r, "Failed to attach system bus to event loop: %m");
+ log_error_errno(r, "Failed to attach system bus to event loop: %m");
return 0;
}
r = bus_setup_system(m, bus);
if (r < 0) {
- log_error_errno(-r, "Failed to set up system bus: %m");
+ log_error_errno(r, "Failed to set up system bus: %m");
return 0;
}
r = sd_event_add_io(m->event, &s, fd, EPOLLIN, bus_on_connection, m);
if (r < 0) {
- log_error_errno(-r, "Failed to allocate event source: %m");
+ log_error_errno(r, "Failed to allocate event source: %m");
return r;
}
return 0;
fail:
- log_warning_errno(-r, "Failed to load device unit: %m");
+ log_warning_errno(r, "Failed to load device unit: %m");
if (delete && u)
unit_free(u);
if (streq(action, "remove") || !device_is_ready(dev)) {
r = device_process_removed_device(m, dev);
if (r < 0)
- log_error_errno(-r, "Failed to process device remove event: %m");
+ log_error_errno(r, "Failed to process device remove event: %m");
r = swap_process_removed_device(m, dev);
if (r < 0)
- log_error_errno(-r, "Failed to process swap device remove event: %m");
+ log_error_errno(r, "Failed to process swap device remove event: %m");
} else {
r = device_process_new_device(m, dev);
if (r < 0)
- log_error_errno(-r, "Failed to process device new event: %m");
+ log_error_errno(r, "Failed to process device new event: %m");
r = swap_process_new_device(m, dev);
if (r < 0)
- log_error_errno(-r, "Failed to process swap device new event: %m");
+ log_error_errno(r, "Failed to process swap device new event: %m");
manager_dispatch_load_queue(m);
* If this fails, ignore the error - but expect sd-pam threads
* to fail to exit normally */
if (setresuid(uid, uid, uid) < 0)
- log_error_errno(-r, "Error: Failed to setresuid() in sd-pam: %m");
+ log_error_errno(r, "Error: Failed to setresuid() in sd-pam: %m");
/* Wait until our parent died. This will only work if
* the above setresuid() succeeds, otherwise the kernel
r = asynchronous_job(remove_tmpdir_thread, rt->tmp_dir);
if (r < 0) {
- log_warning_errno(-r, "Failed to nuke %s: %m", rt->tmp_dir);
+ log_warning_errno(r, "Failed to nuke %s: %m", rt->tmp_dir);
free(rt->tmp_dir);
}
r = asynchronous_job(remove_tmpdir_thread, rt->var_tmp_dir);
if (r < 0) {
- log_warning_errno(-r, "Failed to nuke %s: %m", rt->var_tmp_dir);
+ log_warning_errno(r, "Failed to nuke %s: %m", rt->var_tmp_dir);
free(rt->var_tmp_dir);
}
if (r == -ENOENT)
enoent = true;
else
- log_warning_errno(-r, "Failed to read configured hostname: %m");
+ log_warning_errno(r, "Failed to read configured hostname: %m");
hn = NULL;
} else
j->begin_usec + j->unit->job_timeout, 0,
job_dispatch_timer, j);
if (r < 0)
- log_debug_errno(-r, "Failed to restart timeout for job: %m");
+ log_debug_errno(r, "Failed to restart timeout for job: %m");
return r;
}
r = unit_add_dependency_by_name(u, dependency, de->d_name, f, true);
if (r < 0)
- log_error_errno(-r, "Cannot add dependency %s to %s, ignoring: %m", de->d_name, u->id);
+ log_error_errno(r, "Cannot add dependency %s to %s, ignoring: %m", de->d_name, u->id);
}
return 0;
r = conf_files_list_strv(&configs, ".conf", NULL, (const char**) strv);
if (r < 0) {
- log_error_errno(-r, "Failed to get list of configuration files: %m");
+ log_error_errno(r, "Failed to get list of configuration files: %m");
strv_free(configs);
return NULL;
}
NULL);
if (r < 0 && r != -ENOENT)
- log_warning_errno(-r, "Failed to read /proc/cmdline: %m");
+ log_warning_errno(r, "Failed to read /proc/cmdline: %m");
}
/* Hmm, nothing set on the kernel cmd line? Then let's
NULL);
if (r < 0 && r != -ENOENT)
- log_warning_errno(-r, "Failed to read /etc/locale.conf: %m");
+ log_warning_errno(r, "Failed to read /etc/locale.conf: %m");
}
add = NULL;
/* If that didn't work, generate a random machine id */
r = sd_id128_randomize(&buf);
if (r < 0) {
- log_error_errno(-r, "Failed to open /dev/urandom: %m");
+ log_error_errno(r, "Failed to open /dev/urandom: %m");
return r;
}
r = write_string_file(run_machine_id, id);
}
if (r < 0) {
- log_error_errno(-r, "Cannot write %s: %m", run_machine_id);
+ log_error_errno(r, "Cannot write %s: %m", run_machine_id);
unlink(run_machine_id);
return r;
}
/* Order things nicely. */
r = wait_for_terminate(pid, &status);
if (r < 0)
- log_emergency_errno(-r, "Caught <%s>, waitpid() failed: %m", signal_to_string(sig));
+ log_emergency_errno(r, "Caught <%s>, waitpid() failed: %m", signal_to_string(sig));
else if (status.si_code != CLD_DUMPED)
log_emergency("Caught <%s>, core dump failed.", signal_to_string(sig));
else
tty_fd = open_terminal("/dev/console", O_WRONLY|O_NOCTTY|O_CLOEXEC);
if (tty_fd < 0) {
- log_error_errno(-tty_fd, "Failed to open /dev/console: %m");
+ log_error_errno(tty_fd, "Failed to open /dev/console: %m");
return tty_fd;
}
* pictures already from initrd. */
r = reset_terminal_fd(tty_fd, false);
if (r < 0) {
- log_error_errno(-r, "Failed to reset /dev/console: %m");
+ log_error_errno(r, "Failed to reset /dev/console: %m");
return r;
}
r = set_default_unit(optarg);
if (r < 0) {
- log_error_errno(-r, "Failed to set default unit %s: %m", optarg);
+ log_error_errno(r, "Failed to set default unit %s: %m", optarg);
return r;
}
r = manager_open_serialization(m, &f);
if (r < 0) {
- log_error_errno(-r, "Failed to create serialization file: %m");
+ log_error_errno(r, "Failed to create serialization file: %m");
goto fail;
}
fds = fdset_new();
if (!fds) {
r = -ENOMEM;
- log_error_errno(-r, "Failed to allocate fd set: %m");
+ log_error_errno(r, "Failed to allocate fd set: %m");
goto fail;
}
r = manager_serialize(m, f, fds, switching_root);
if (r < 0) {
- log_error_errno(-r, "Failed to serialize state: %m");
+ log_error_errno(r, "Failed to serialize state: %m");
goto fail;
}
r = fd_cloexec(fileno(f), false);
if (r < 0) {
- log_error_errno(-r, "Failed to disable O_CLOEXEC for serialization: %m");
+ log_error_errno(r, "Failed to disable O_CLOEXEC for serialization: %m");
goto fail;
}
r = fdset_cloexec(fds, false);
if (r < 0) {
- log_error_errno(-r, "Failed to disable O_CLOEXEC for serialization fds: %m");
+ log_error_errno(r, "Failed to disable O_CLOEXEC for serialization fds: %m");
goto fail;
}
nl.rlim_cur = nl.rlim_max = 64*1024;
r = setrlimit_closest(RLIMIT_NOFILE, &nl);
if (r < 0) {
- log_error_errno(-r, "Setting RLIMIT_NOFILE failed: %m");
+ log_error_errno(r, "Setting RLIMIT_NOFILE failed: %m");
return r;
}
if (r == -EEXIST)
continue;
if (r < 0) {
- log_error_errno(-r, "Failed to add architecture to seccomp: %m");
+ log_error_errno(r, "Failed to add architecture to seccomp: %m");
goto finish;
}
}
r = seccomp_attr_set(seccomp, SCMP_FLTATR_CTL_NNP, 0);
if (r < 0) {
- log_error_errno(-r, "Failed to unset NO_NEW_PRIVS: %m");
+ log_error_errno(r, "Failed to unset NO_NEW_PRIVS: %m");
goto finish;
}
r = seccomp_load(seccomp);
if (r < 0)
- log_error_errno(-r, "Failed to add install architecture seccomp: %m");
+ log_error_errno(r, "Failed to add install architecture seccomp: %m");
finish:
seccomp_release(seccomp);
}
if (r < 0 && r != -ENOENT)
- log_warning_errno(-r, "Failed to read os-release file: %m");
+ log_warning_errno(r, "Failed to read os-release file: %m");
return status_printf(NULL, false, false,
"\nWelcome to \x1B[%sm%s\x1B[0m!\n",
*/
r = clock_set_timezone(&min);
if (r < 0)
- log_error_errno(-r, "Failed to apply local time delta, ignoring: %m");
+ log_error_errno(r, "Failed to apply local time delta, ignoring: %m");
else
log_info("RTC configured in localtime, applying delta of %i minutes to system time.", min);
} else if (!in_initrd()) {
/* Initialize default unit */
r = set_default_unit(SPECIAL_DEFAULT_TARGET);
if (r < 0) {
- log_emergency_errno(-r, "Failed to set default unit %s: %m", SPECIAL_DEFAULT_TARGET);
+ log_emergency_errno(r, "Failed to set default unit %s: %m", SPECIAL_DEFAULT_TARGET);
error_message = "Failed to set default unit";
goto finish;
}
if (arg_running_as == SYSTEMD_SYSTEM) {
r = parse_proc_cmdline(parse_proc_cmdline_item);
if (r < 0)
- log_warning_errno(-r, "Failed to parse kernel command line, ignoring: %m");
+ log_warning_errno(r, "Failed to parse kernel command line, ignoring: %m");
}
/* Note that this also parses bits from the kernel command
/* Remember open file descriptors for later deserialization */
r = fdset_new_fill(&fds);
if (r < 0) {
- log_emergency_errno(-r, "Failed to allocate fd set: %m");
+ log_emergency_errno(r, "Failed to allocate fd set: %m");
error_message = "Failed to allocate fd set";
goto finish;
} else
if (arg_capability_bounding_set_drop) {
r = capability_bounding_set_drop_usermode(arg_capability_bounding_set_drop);
if (r < 0) {
- log_emergency_errno(-r, "Failed to drop capability bounding set of usermode helpers: %m");
+ log_emergency_errno(r, "Failed to drop capability bounding set of usermode helpers: %m");
error_message = "Failed to drop capability bounding set of usermode helpers";
goto finish;
}
r = capability_bounding_set_drop(arg_capability_bounding_set_drop, true);
if (r < 0) {
- log_emergency_errno(-r, "Failed to drop capability bounding set: %m");
+ log_emergency_errno(r, "Failed to drop capability bounding set: %m");
error_message = "Failed to drop capability bounding set";
goto finish;
}
if (empty_etc) {
r = unit_file_preset_all(UNIT_FILE_SYSTEM, false, NULL, UNIT_FILE_PRESET_FULL, false, NULL, 0);
if (r < 0)
- log_warning_errno(-r, "Failed to populate /etc with preset unit settings, ignoring: %m");
+ log_warning_errno(r, "Failed to populate /etc with preset unit settings, ignoring: %m");
else
log_info("Populated /etc with preset unit settings.");
}
r = manager_new(arg_running_as, arg_action == ACTION_TEST, &m);
if (r < 0) {
- log_emergency_errno(-r, "Failed to allocate manager object: %m");
+ log_emergency_errno(r, "Failed to allocate manager object: %m");
error_message = "Failed to allocate manager object";
goto finish;
}
r = manager_startup(m, arg_serialization, fds);
if (r < 0)
- log_error_errno(-r, "Failed to fully start up daemon: %m");
+ log_error_errno(r, "Failed to fully start up daemon: %m");
/* This will close all file descriptors that were opened, but
* not claimed by any unit. */
for (;;) {
r = manager_loop(m);
if (r < 0) {
- log_emergency_errno(-r, "Failed to run main loop: %m");
+ log_emergency_errno(r, "Failed to run main loop: %m");
error_message = "Failed to run main loop";
goto finish;
}
log_info("Reloading.");
r = manager_reload(m);
if (r < 0)
- log_error_errno(-r, "Failed to reload: %m");
+ log_error_errno(r, "Failed to reload: %m");
break;
case MANAGER_REEXECUTE:
/* And switch root with MS_MOVE, because we remove the old directory afterwards and detach it. */
r = switch_root(switch_root_dir, "/mnt", true, MS_MOVE);
if (r < 0)
- log_error_errno(-r, "Failed to switch root, trying to continue: %m");
+ log_error_errno(r, "Failed to switch root, trying to continue: %m");
}
args_size = MAX(6, argc+1);
r = sd_event_add_io(m->event, &m->idle_pipe_event_source, m->idle_pipe[2], EPOLLIN, manager_dispatch_idle_pipe_fd, m);
if (r < 0) {
- log_error_errno(-r, "Failed to watch idle pipe: %m");
+ log_error_errno(r, "Failed to watch idle pipe: %m");
return r;
}
r = sd_event_add_io(m->event, &m->time_change_event_source, m->time_change_fd, EPOLLIN, manager_dispatch_time_change_fd, m);
if (r < 0) {
- log_error_errno(-r, "Failed to create time change event source: %m");
+ log_error_errno(r, "Failed to create time change event source: %m");
return r;
}
if (!m->notify_event_source) {
r = sd_event_add_io(m->event, &m->notify_event_source, m->notify_fd, EPOLLIN, manager_dispatch_notify_fd, m);
if (r < 0) {
- log_error_errno(-r, "Failed to allocate notify event source: %m");
+ log_error_errno(r, "Failed to allocate notify event source: %m");
return -errno;
}
* still identify to which service an exit message belongs */
r = sd_event_source_set_priority(m->notify_event_source, -7);
if (r < 0) {
- log_error_errno(-r, "Failed to set priority of notify event source: %m");
+ log_error_errno(r, "Failed to set priority of notify event source: %m");
return r;
}
}
return;
fail:
- log_error_errno(-r, "Failed to build unit path cache: %m");
+ log_error_errno(r, "Failed to build unit path cache: %m");
set_free_free(m->unit_path_cache);
m->unit_path_cache = NULL;
r = sd_event_run(m->event, wait_usec);
if (r < 0) {
- log_error_errno(-r, "Failed to run event loop: %m");
+ log_error_errno(r, "Failed to run event loop: %m");
return r;
}
}
r = mount_load_proc_self_mountinfo(m, true);
if (r < 0) {
- log_error_errno(-r, "Failed to reread /proc/self/mountinfo: %m");
+ log_error_errno(r, "Failed to reread /proc/self/mountinfo: %m");
/* Reset flags, just in case, for later calls */
LIST_FOREACH(units_by_type, u, m->units_by_type[UNIT_MOUNT]) {
r = mkdir_p_label(s->path, mode);
if (r < 0)
- log_warning_errno(-r, "mkdir(%s) failed: %m", s->path);
+ log_warning_errno(r, "mkdir(%s) failed: %m", s->path);
}
static void path_spec_dump(PathSpec *s, FILE *f, const char *prefix) {
r = unit_realize_cgroup(u);
if (r < 0) {
- log_error_errno(-r, "Failed to realize cgroup: %m");
+ log_error_errno(r, "Failed to realize cgroup: %m");
return r;
}
} else if (r > 0)
log_info("Not all file systems unmounted, %d left.", r);
else
- log_error_errno(-r, "Failed to unmount file systems: %m");
+ log_error_errno(r, "Failed to unmount file systems: %m");
}
if (need_swapoff) {
} else if (r > 0)
log_info("Not all swaps deactivated, %d left.", r);
else
- log_error_errno(-r, "Failed to deactivate swaps: %m");
+ log_error_errno(r, "Failed to deactivate swaps: %m");
}
if (need_loop_detach) {
} else if (r > 0)
log_info("Not all loop devices detached, %d left.", r);
else
- log_error_errno(-r, "Failed to detach loop devices: %m");
+ log_error_errno(r, "Failed to detach loop devices: %m");
}
if (need_dm_detach) {
} else if (r > 0)
log_info("Not all DM devices detached, %d left.", r);
else
- log_error_errno(-r, "Failed to detach DM devices: %m");
+ log_error_errno(r, "Failed to detach DM devices: %m");
}
if (!need_umount && !need_swapoff && !need_loop_detach && !need_dm_detach) {
execv("/shutdown", argv);
log_error("Failed to execute shutdown binary: %m");
} else
- log_error_errno(-r, "Failed to switch root to \"/run/initramfs\": %m");
+ log_error_errno(r, "Failed to switch root to \"/run/initramfs\": %m");
}
r = -errno;
error:
- log_emergency_errno(-r, "Critical error while doing system shutdown: %m");
+ log_emergency_errno(r, "Critical error while doing system shutdown: %m");
freeze();
}
fail_child:
log_open();
- log_error_errno(-r, "Failed to chown socket at step %s: %m", exit_status_to_string(ret, EXIT_STATUS_SYSTEMD));
+ log_error_errno(r, "Failed to chown socket at step %s: %m", exit_status_to_string(ret, EXIT_STATUS_SYSTEMD));
_exit(ret);
}
r = swap_load_proc_swaps(m, true);
if (r < 0) {
- log_error_errno(-r, "Failed to reread /proc/swaps: %m");
+ log_error_errno(r, "Failed to reread /proc/swaps: %m");
/* Reset flags, just in case, for late calls */
LIST_FOREACH(units_by_type, u, m->units_by_type[UNIT_SWAP]) {
r = get_home_dir(&h);
if (r < 0) {
- log_error_errno(-r, "Failed to determine home directory: %m");
+ log_error_errno(r, "Failed to determine home directory: %m");
return r;
}
/* Tenth step: apply changes */
r = transaction_apply(tr, m, mode);
if (r < 0) {
- log_warning_errno(-r, "Failed to apply transaction: %m");
+ log_warning_errno(r, "Failed to apply transaction: %m");
return r;
}
"# Automatically generated by systemd-cryptsetup-generator \n\n"
"[Unit]\nJobTimeoutSec=0");
if (r < 0) {
- log_error_errno(-r, "Failed to write device drop-in: %m");
+ log_error_errno(r, "Failed to write device drop-in: %m");
return r;
}
}
z = parse_proc_cmdline(parse_proc_cmdline_item);
if (z < 0)
- log_warning_errno(-z, "Failed to parse kernel command line, ignoring: %m");
+ log_warning_errno(z, "Failed to parse kernel command line, ignoring: %m");
if (!arg_enabled) {
r = r2 = EXIT_SUCCESS;
r = ask_password_auto(text, "drive-harddisk", id, until, accept_cached, passwords);
if (r < 0) {
- log_error_errno(-r, "Failed to query password: %m");
+ log_error_errno(r, "Failed to query password: %m");
return r;
}
r = ask_password_auto(text, "drive-harddisk", id, until, false, &passwords2);
if (r < 0) {
- log_error_errno(-r, "Failed to query verification password: %m");
+ log_error_errno(r, "Failed to query verification password: %m");
return r;
}
if (key_file) {
r = read_one_line_file(key_file, &passphrase);
if (r < 0) {
- log_error_errno(-r, "Failed to read password file '%s': %m", key_file);
+ log_error_errno(r, "Failed to read password file '%s': %m", key_file);
return -EAGAIN;
}
}
if (r < 0) {
- log_error_errno(-r, "Loading of cryptographic parameters failed: %m");
+ log_error_errno(r, "Loading of cryptographic parameters failed: %m");
return r;
}
key_file, arg_keyfile_size,
arg_keyfile_offset, flags);
if (r < 0) {
- log_error_errno(-r, "Failed to activate with key file '%s': %m", key_file);
+ log_error_errno(r, "Failed to activate with key file '%s': %m", key_file);
return -EAGAIN;
}
} else {
k = crypt_init(&cd, argv[3]);
if (k) {
- log_error_errno(-k, "crypt_init() failed: %m");
+ log_error_errno(k, "crypt_init() failed: %m");
goto finish;
}
key_file = NULL;
continue;
} else if (k != -EPERM) {
- log_error_errno(-k, "Failed to activate: %m");
+ log_error_errno(k, "Failed to activate: %m");
goto finish;
}
k = crypt_init_by_name(&cd, argv[2]);
if (k) {
- log_error_errno(-k, "crypt_init() failed: %m");
+ log_error_errno(k, "crypt_init() failed: %m");
goto finish;
}
k = crypt_deactivate(cd, argv[2]);
if (k < 0) {
- log_error_errno(-k, "Failed to deactivate: %m");
+ log_error_errno(k, "Failed to deactivate: %m");
goto finish;
}
r = fflush_and_check(f);
if (r < 0) {
- log_error_errno(-r, "Failed to write %s: %m", a);
+ log_error_errno(r, "Failed to write %s: %m", a);
return r;
}
r = fflush_and_check(f);
if (r < 0) {
- log_error_errno(-r, "Failed to write %s: %m", b);
+ log_error_errno(r, "Failed to write %s: %m", b);
return r;
}
type = "system";
units = SYSTEM_DATA_UNIT_PATH;
} else {
- log_error_errno(-r, "Failed to determine whether we are running as user or system instance: %m");
+ log_error_errno(r, "Failed to determine whether we are running as user or system instance: %m");
return r;
}
r = parse_proc_cmdline(parse_proc_cmdline_item);
if (r < 0)
- log_warning_errno(-r, "Failed to parse kernel command line, ignoring: %m");
+ log_warning_errno(r, "Failed to parse kernel command line, ignoring: %m");
if (arg_debug_shell) {
r = strv_extend(&arg_wants, "debug-shell.service");
r = get_files_in_directory(path, &list);
if (r < 0){
- log_error_errno(-r, "Failed to enumerate %s: %m", path);
+ log_error_errno(r, "Failed to enumerate %s: %m", path);
return r;
}
v = detect_virtualization(&id);
if (v < 0) {
- log_error_errno(-v, "Failed to check for virtualization: %m");
+ log_error_errno(v, "Failed to check for virtualization: %m");
return EXIT_FAILURE;
}
case ONLY_CONTAINER:
r = detect_container(&id);
if (r < 0) {
- log_error_errno(-r, "Failed to check for container: %m");
+ log_error_errno(r, "Failed to check for container: %m");
return EXIT_FAILURE;
}
case ONLY_VM:
r = detect_vm(&id);
if (r < 0) {
- log_error_errno(-r, "Failed to check for vm: %m");
+ log_error_errno(r, "Failed to check for vm: %m");
return EXIT_FAILURE;
}
log_debug("EFI loader partition unknown, exiting.");
return EXIT_SUCCESS;
} else if (r < 0) {
- log_error_errno(-r, "Failed to read ESP partition UUID: %m");
+ log_error_errno(r, "Failed to read ESP partition UUID: %m");
return EXIT_FAILURE;
}
}
if (r < 0 && r != -ENOENT)
- log_warning_errno(-r, "Failed to read os-release file: %m");
+ log_warning_errno(r, "Failed to read os-release file: %m");
printf("\nWelcome to your new installation of %s!\nPlease configure a few basic system settings:\n\n",
isempty(pretty_name) ? "Linux" : pretty_name);
r = ask_string(&p, "%s %s (empty to skip): ", draw_special_char(DRAW_TRIANGULAR_BULLET), text);
if (r < 0) {
- log_error_errno(-r, "Failed to query user: %m");
+ log_error_errno(r, "Failed to query user: %m");
return r;
}
r = get_locales(&locales);
if (r < 0) {
- log_error_errno(-r, "Cannot query locales list: %m");
+ log_error_errno(r, "Cannot query locales list: %m");
return r;
}
r = copy_file("/etc/locale.conf", etc_localeconf, 0, 0644);
if (r != -ENOENT) {
if (r < 0) {
- log_error_errno(-r, "Failed to copy %s: %m", etc_localeconf);
+ log_error_errno(r, "Failed to copy %s: %m", etc_localeconf);
return r;
}
mkdir_parents(etc_localeconf, 0755);
r = write_env_file(etc_localeconf, locales);
if (r < 0) {
- log_error_errno(-r, "Failed to write %s: %m", etc_localeconf);
+ log_error_errno(r, "Failed to write %s: %m", etc_localeconf);
return r;
}
r = get_timezones(&zones);
if (r < 0) {
- log_error_errno(-r, "Cannot query timezone list: %m");
+ log_error_errno(r, "Cannot query timezone list: %m");
return r;
}
r = readlink_malloc("/etc/localtime", &p);
if (r != -ENOENT) {
if (r < 0) {
- log_error_errno(-r, "Failed to read host timezone: %m");
+ log_error_errno(r, "Failed to read host timezone: %m");
return r;
}
r = ask_string(&h, "%s Please enter hostname for new system (empty to skip): ", draw_special_char(DRAW_TRIANGULAR_BULLET));
if (r < 0) {
- log_error_errno(-r, "Failed to query hostname: %m");
+ log_error_errno(r, "Failed to query hostname: %m");
return r;
}
mkdir_parents(etc_hostname, 0755);
r = write_string_file(etc_hostname, arg_hostname);
if (r < 0) {
- log_error_errno(-r, "Failed to write %s: %m", etc_hostname);
+ log_error_errno(r, "Failed to write %s: %m", etc_hostname);
return r;
}
mkdir_parents(etc_machine_id, 0755);
r = write_string_file(etc_machine_id, sd_id128_to_string(arg_machine_id, id));
if (r < 0) {
- log_error_errno(-r, "Failed to write machine id: %m");
+ log_error_errno(r, "Failed to write machine id: %m");
return r;
}
r = ask_password_tty(msg1, 0, false, NULL, &a);
if (r < 0) {
- log_error_errno(-r, "Failed to query root password: %m");
+ log_error_errno(r, "Failed to query root password: %m");
return r;
}
r = ask_password_tty(msg2, 0, false, NULL, &b);
if (r < 0) {
- log_error_errno(-r, "Failed to query root password: %m");
+ log_error_errno(r, "Failed to query root password: %m");
clear_string(a);
return r;
}
r = write_root_shadow(etc_shadow, p);
if (r < 0) {
- log_error_errno(-r, "Failed to write %s: %m", etc_shadow);
+ log_error_errno(r, "Failed to write %s: %m", etc_shadow);
return r;
}
r = dev_urandom(raw, 16);
if (r < 0) {
- log_error_errno(-r, "Failed to get salt: %m");
+ log_error_errno(r, "Failed to get salt: %m");
return r;
}
r = write_root_shadow(etc_shadow, &item);
if (r < 0) {
- log_error_errno(-r, "Failed to write %s: %m", etc_shadow);
+ log_error_errno(r, "Failed to write %s: %m", etc_shadow);
return r;
}
r = read_one_line_file(optarg, &arg_root_password);
if (r < 0) {
- log_error_errno(-r, "Failed to read %s: %m", optarg);
+ log_error_errno(r, "Failed to read %s: %m", optarg);
return r;
}
r = sd_id128_randomize(&arg_machine_id);
if (r < 0) {
- log_error_errno(-r, "Failed to generate randomized machine ID: %m");
+ log_error_errno(r, "Failed to generate randomized machine ID: %m");
return r;
}
r = bus_open_system_systemd(&bus);
if (r < 0) {
- log_error_errno(-r, "Failed to get D-Bus connection: %m");
+ log_error_errno(r, "Failed to get D-Bus connection: %m");
return;
}
q = parse_proc_cmdline(parse_proc_cmdline_item);
if (q < 0)
- log_warning_errno(-q, "Failed to parse kernel command line, ignoring: %m");
+ log_warning_errno(q, "Failed to parse kernel command line, ignoring: %m");
test_files();
log_info("fsck.%s doesn't exist, not checking file system on %s", type, device);
return EXIT_SUCCESS;
} else if (r < 0)
- log_warning_errno(-r, "fsck.%s cannot be used for %s: %m", type, device);
+ log_warning_errno(r, "fsck.%s cannot be used for %s: %m", type, device);
}
if (arg_show_progress)
q = wait_for_terminate(pid, &status);
if (q < 0) {
- log_error_errno(-q, "waitid(): %m");
+ log_error_errno(q, "waitid(): %m");
goto finish;
}
r = fflush_and_check(f);
if (r < 0) {
- log_error_errno(-r, "Failed to write unit file %s: %m", unit);
+ log_error_errno(r, "Failed to write unit file %s: %m", unit);
return r;
}
r = parse_proc_cmdline(parse_proc_cmdline_item);
if (r < 0)
- log_warning_errno(-r, "Failed to parse kernel command line, ignoring: %m");
+ log_warning_errno(r, "Failed to parse kernel command line, ignoring: %m");
/* Always honour root= and usr= in the kernel command line if we are in an initrd */
if (in_initrd()) {
"[Unit]\n"
"JobTimeoutSec=0\n"); /* the binary handles timeouts anyway */
if (r < 0) {
- log_error_errno(-r, "Failed to write device drop-in: %m");
+ log_error_errno(r, "Failed to write device drop-in: %m");
return r;
}
r = udev_enumerate_scan_devices(e);
if (r < 0) {
- log_error_errno(-r, "Failed to enumerate partitions on %s: %m", node);
+ log_error_errno(r, "Failed to enumerate partitions on %s: %m", node);
return r;
}
log_debug("EFI loader partition unknown, exiting.");
return 0;
} else if (r < 0) {
- log_error_errno(-r, "Failed to read ESP partition UUID: %m");
+ log_error_errno(r, "Failed to read ESP partition UUID: %m");
return r;
}
r = get_block_device("/", &devno);
if (r < 0) {
- log_error_errno(-r, "Failed to determine block device of root file system: %m");
+ log_error_errno(r, "Failed to determine block device of root file system: %m");
return r;
} else if (r == 0) {
log_debug("Root file system not on a (single) block device.");
r = parse_proc_cmdline(parse_proc_cmdline_item);
if (r < 0)
- log_warning_errno(-r, "Failed to parse kernel command line, ignoring: %m");
+ log_warning_errno(r, "Failed to parse kernel command line, ignoring: %m");
if (!arg_enabled) {
log_debug("Disabled, exiting.");
r = parse_proc_cmdline(parse_proc_cmdline_item);
if (r < 0)
- log_warning_errno(-r, "Failed to parse kernel command line, ignoring: %m");
+ log_warning_errno(r, "Failed to parse kernel command line, ignoring: %m");
r = process_resume();
free(arg_resume_dev);
r = write_string_file("/sys/power/resume", major_minor);
if (r < 0) {
- log_error_errno(-r, "Failed to write '%s' to /sys/power/resume: %m", major_minor);
+ log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor);
return EXIT_FAILURE;
}
r = bus_open_transport(arg_transport, arg_host, false, &bus);
if (r < 0) {
- log_error_errno(-r, "Failed to create bus connection: %m");
+ log_error_errno(r, "Failed to create bus connection: %m");
goto finish;
}
r = context_update_kernel_hostname(c);
if (r < 0) {
- log_error_errno(-r, "Failed to set host name: %m");
+ log_error_errno(r, "Failed to set host name: %m");
return sd_bus_error_set_errnof(error, r, "Failed to set hostname: %s", strerror(-r));
}
r = context_update_kernel_hostname(c);
if (r < 0) {
- log_error_errno(-r, "Failed to set host name: %m");
+ log_error_errno(r, "Failed to set host name: %m");
return sd_bus_error_set_errnof(error, r, "Failed to set hostname: %s", strerror(-r));
}
r = context_write_data_static_hostname(c);
if (r < 0) {
- log_error_errno(-r, "Failed to write static host name: %m");
+ log_error_errno(r, "Failed to write static host name: %m");
return sd_bus_error_set_errnof(error, r, "Failed to set static hostname: %s", strerror(-r));
}
r = context_write_data_machine_info(c);
if (r < 0) {
- log_error_errno(-r, "Failed to write machine info: %m");
+ log_error_errno(r, "Failed to write machine info: %m");
return sd_bus_error_set_errnof(error, r, "Failed to write machine info: %s", strerror(-r));
}
r = sd_bus_default_system(&bus);
if (r < 0) {
- log_error_errno(-r, "Failed to get system bus connection: %m");
+ log_error_errno(r, "Failed to get system bus connection: %m");
return r;
}
r = sd_bus_add_object_vtable(bus, NULL, "/org/freedesktop/hostname1", "org.freedesktop.hostname1", hostname_vtable, c);
if (r < 0) {
- log_error_errno(-r, "Failed to register object: %m");
+ log_error_errno(r, "Failed to register object: %m");
return r;
}
r = sd_bus_request_name(bus, "org.freedesktop.hostname1", 0);
if (r < 0) {
- log_error_errno(-r, "Failed to register name: %m");
+ log_error_errno(r, "Failed to register name: %m");
return r;
}
r = sd_bus_attach_event(bus, event, 0);
if (r < 0) {
- log_error_errno(-r, "Failed to attach bus to event loop: %m");
+ log_error_errno(r, "Failed to attach bus to event loop: %m");
return r;
}
r = sd_event_default(&event);
if (r < 0) {
- log_error_errno(-r, "Failed to allocate event loop: %m");
+ log_error_errno(r, "Failed to allocate event loop: %m");
goto finish;
}
r = context_read_data(&context);
if (r < 0) {
- log_error_errno(-r, "Failed to read hostname and machine information: %m");
+ log_error_errno(r, "Failed to read hostname and machine information: %m");
goto finish;
}
r = bus_event_loop_with_idle(event, bus, "org.freedesktop.hostname1", DEFAULT_EXIT_USEC, NULL, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to run event loop: %m");
+ log_error_errno(r, "Failed to run event loop: %m");
goto finish;
}
r = bus_open_system_systemd(&s->bus);
if (r < 0) {
- log_error_errno(-r, "Failed to get D-Bus connection: %m");
+ log_error_errno(r, "Failed to get D-Bus connection: %m");
r = -EIO;
goto fail;
}
f = (Fifo*) ev->data.ptr;
r = fifo_process(f);
if (r < 0) {
- log_info_errno(-r, "Got error on fifo: %m");
+ log_info_errno(r, "Got error on fifo: %m");
fifo_free(f);
return r;
}
n = sd_listen_fds(true);
if (n < 0) {
- log_error_errno(-r, "Failed to read listening file descriptors from environment: %m");
+ log_error_errno(r, "Failed to read listening file descriptors from environment: %m");
return EXIT_FAILURE;
}
r = sd_journal_next(m->journal);
if (r < 0) {
- log_error_errno(-r, "Failed to advance journal pointer: %m");
+ log_error_errno(r, "Failed to advance journal pointer: %m");
return MHD_CONTENT_READER_END_WITH_ERROR;
} else if (r == 0) {
if (m->follow) {
r = sd_journal_wait(m->journal, (uint64_t) -1);
if (r < 0) {
- log_error_errno(-r, "Couldn't wait for journal event: %m");
+ log_error_errno(r, "Couldn't wait for journal event: %m");
return MHD_CONTENT_READER_END_WITH_ERROR;
}
r = sd_journal_test_cursor(m->journal, m->cursor);
if (r < 0) {
- log_error_errno(-r, "Failed to test cursor: %m");
+ log_error_errno(r, "Failed to test cursor: %m");
return MHD_CONTENT_READER_END_WITH_ERROR;
}
r = output_journal(m->tmp, m->journal, m->mode, 0, OUTPUT_FULL_WIDTH, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to serialize item: %m");
+ log_error_errno(r, "Failed to serialize item: %m");
return MHD_CONTENT_READER_END_WITH_ERROR;
}
r = sd_id128_get_boot(&bid);
if (r < 0) {
- log_error_errno(-r, "Failed to get boot ID: %m");
+ log_error_errno(r, "Failed to get boot ID: %m");
return MHD_NO;
}
r = sd_journal_enumerate_unique(m->journal, &d, &l);
if (r < 0) {
- log_error_errno(-r, "Failed to advance field index: %m");
+ log_error_errno(r, "Failed to advance field index: %m");
return MHD_CONTENT_READER_END_WITH_ERROR;
} else if (r == 0)
return MHD_CONTENT_READER_END_OF_STREAM;
r = output_field(m->tmp, m->mode, d, l);
if (r < 0) {
- log_error_errno(-r, "Failed to serialize item: %m");
+ log_error_errno(r, "Failed to serialize item: %m");
return MHD_CONTENT_READER_END_WITH_ERROR;
}
}
r = read_full_file(optarg, &key_pem, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to read key file: %m");
+ log_error_errno(r, "Failed to read key file: %m");
return r;
}
assert(key_pem);
}
r = read_full_file(optarg, &cert_pem, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to read certificate file: %m");
+ log_error_errno(r, "Failed to read certificate file: %m");
return r;
}
assert(cert_pem);
}
r = read_full_file(optarg, &trust_pem, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to read CA certificate file: %m");
+ log_error_errno(r, "Failed to read CA certificate file: %m");
return r;
}
assert(trust_pem);
n = sd_listen_fds(1);
if (n < 0) {
- log_error_errno(-n, "Failed to determine passed sockets: %m");
+ log_error_errno(n, "Failed to determine passed sockets: %m");
goto finish;
} else if (n > 1) {
log_error("Can't listen on more than one socket.");
return 1;
}
- log_debug_errno(-r, "%s: Write failed, rotating: %m", w->journal->path);
+ log_debug_errno(r, "%s: Write failed, rotating: %m", w->journal->path);
r = do_rotate(&w->journal, compress, seal);
if (r < 0)
return r;
assert(getter);
r = strv_split_quoted(&words, getter, false);
if (r < 0) {
- log_error_errno(-r, "Failed to split getter option: %m");
+ log_error_errno(r, "Failed to split getter option: %m");
return r;
}
r = strv_extend(&words, url);
if (r < 0) {
- log_error_errno(-r, "Failed to create command line: %m");
+ log_error_errno(r, "Failed to create command line: %m");
return r;
}
r = sd_event_source_set_description(source->event, name);
if (r < 0) {
- log_error_errno(-r, "Failed to set source name for fd:%d: %m", fd);
+ log_error_errno(r, "Failed to set source name for fd:%d: %m", fd);
goto error;
}
r = fd_nonblock(fd, true);
if (r < 0) {
- log_error_errno(-r, "Failed to make fd:%d nonblocking: %m", fd);
+ log_error_errno(r, "Failed to make fd:%d nonblocking: %m", fd);
return r;
}
epoll_fd, EPOLLIN,
dispatch_http_event, d);
if (r < 0) {
- log_error_errno(-r, "Failed to add event callback: %m");
+ log_error_errno(r, "Failed to add event callback: %m");
goto error;
}
r = sd_event_source_set_description(d->event, "epoll-fd");
if (r < 0) {
- log_error_errno(-r, "Failed to set source name: %m");
+ log_error_errno(r, "Failed to set source name: %m");
goto error;
}
r = hashmap_put(s->daemons, &d->fd, d);
if (r < 0) {
- log_error_errno(-r, "Failed to add daemon to hashmap: %m");
+ log_error_errno(r, "Failed to add daemon to hashmap: %m");
goto error;
}
r = sd_event_default(&s->events);
if (r < 0) {
- log_error_errno(-r, "Failed to allocate event loop: %m");
+ log_error_errno(r, "Failed to allocate event loop: %m");
return r;
}
r = getnameinfo_pretty(fd, &hostname);
if (r < 0) {
- log_error_errno(-r, "Failed to retrieve remote name: %m");
+ log_error_errno(r, "Failed to retrieve remote name: %m");
return r;
}
} else if (r == -EAGAIN) {
return 0;
} else if (r < 0) {
- log_info_errno(-r, "Closing connection: %m");
+ log_info_errno(r, "Closing connection: %m");
remove_source(server, fd);
return 0;
} else
r = socket_address_print(addr, &a);
if (r < 0) {
- log_error_errno(-r, "socket_address_print(): %m");
+ log_error_errno(r, "socket_address_print(): %m");
close(fd2);
return r;
}
r = sd_event_set_watchdog(s.events, true);
if (r < 0)
- log_error_errno(-r, "Failed to enable watchdog: %m");
+ log_error_errno(r, "Failed to enable watchdog: %m");
else
log_debug("Watchdog is %s.", r > 0 ? "enabled" : "disabled");
r = sd_event_run(s.events, -1);
if (r < 0) {
- log_error_errno(-r, "Failed to run event loop: %m");
+ log_error_errno(r, "Failed to run event loop: %m");
break;
}
}
r = sd_journal_get_cursor(u->journal, &u->current_cursor);
if (r < 0) {
- log_error_errno(-r, "Failed to get cursor: %m");
+ log_error_errno(r, "Failed to get cursor: %m");
return r;
}
r = sd_journal_get_realtime_usec(u->journal, &realtime);
if (r < 0) {
- log_error_errno(-r, "Failed to get realtime timestamp: %m");
+ log_error_errno(r, "Failed to get realtime timestamp: %m");
return r;
}
r = sd_journal_get_monotonic_usec(u->journal, &monotonic, &boot_id);
if (r < 0) {
- log_error_errno(-r, "Failed to get monotonic timestamp: %m");
+ log_error_errno(r, "Failed to get monotonic timestamp: %m");
return r;
}
r = sd_journal_get_monotonic_usec(u->journal, NULL, &boot_id);
if (r < 0) {
- log_error_errno(-r, "Failed to get monotonic timestamp: %m");
+ log_error_errno(r, "Failed to get monotonic timestamp: %m");
return r;
}
r = sd_journal_next_skip(u->journal, skip);
if (r < 0) {
- log_error_errno(-r, "Failed to skip to next entry: %m");
+ log_error_errno(r, "Failed to skip to next entry: %m");
return r;
} else if (r < skip)
return 0;
r = sd_journal_process(u->journal);
if (r < 0) {
- log_error_errno(-r, "Failed to process journal: %m");
+ log_error_errno(r, "Failed to process journal: %m");
close_journal_input(u);
return r;
}
if (follow) {
fd = sd_journal_get_fd(j);
if (fd < 0) {
- log_error_errno(-fd, "sd_journal_get_fd failed: %m");
+ log_error_errno(fd, "sd_journal_get_fd failed: %m");
return fd;
}
r = sd_event_add_io(u->events, &u->input_event,
fd, events, dispatch_journal_input, u);
if (r < 0) {
- log_error_errno(-r, "Failed to register input event: %m");
+ log_error_errno(r, "Failed to register input event: %m");
return r;
}
finish:
if (r < 0)
- log_error_errno(-r, "Failed to save state %s: %m", u->state_file);
+ log_error_errno(r, "Failed to save state %s: %m", u->state_file);
return r;
}
fd, EPOLLIN, dispatch_fd_input, u);
if (r < 0) {
if (r != -EPERM || arg_follow > 0) {
- log_error_errno(-r, "Failed to register input event: %m");
+ log_error_errno(r, "Failed to register input event: %m");
return r;
}
r = sd_event_default(&u->events);
if (r < 0) {
- log_error_errno(-r, "sd_event_default failed: %m");
+ log_error_errno(r, "sd_event_default failed: %m");
return r;
}
r = setup_signals(u);
if (r < 0) {
- log_error_errno(-r, "Failed to set up signals: %m");
+ log_error_errno(r, "Failed to set up signals: %m");
return r;
}
case ARG_FILE:
r = glob_extend(&arg_file, optarg);
if (r < 0) {
- log_error_errno(-r, "Failed to add paths: %m");
+ log_error_errno(r, "Failed to add paths: %m");
return r;
};
break;
r = sd_event_run(u.events, u.timeout);
if (r < 0) {
- log_error_errno(-r, "Failed to run event loop: %m");
+ log_error_errno(r, "Failed to run event loop: %m");
break;
}
}
r = gnutls_certificate_verify_peers2(session, &status);
if (r < 0) {
- log_error_errno(-r, "gnutls_certificate_verify_peers2 failed: %m");
+ log_error_errno(r, "gnutls_certificate_verify_peers2 failed: %m");
return r;
}
type = gnutls_certificate_type_get(session);
r = gnutls_certificate_verification_status_print(status, type, &out, 0);
if (r < 0) {
- log_error_errno(-r, "gnutls_certificate_verification_status_print failed: %m");
+ log_error_errno(r, "gnutls_certificate_verification_status_print failed: %m");
return r;
}
fd = sd_journal_stream_fd(arg_identifier, arg_priority, arg_level_prefix);
if (fd < 0) {
- log_error_errno(-fd, "Failed to create stream fd: %m");
+ log_error_errno(fd, "Failed to create stream fd: %m");
r = fd;
goto finish;
}
if (saved_stderr >= 0)
dup3(saved_stderr, STDERR_FILENO, 0);
- log_error_errno(-r, "Failed to execute process: %m");
+ log_error_errno(r, "Failed to execute process: %m");
finish:
safe_close(fd);
r = mkdir_p(d, 0775);
if (r < 0) {
- log_error_errno(-r, "Recursive mkdir %s: %m", d);
+ log_error_errno(r, "Recursive mkdir %s: %m", d);
return r;
}
r = conf_files_list_strv(&files, ".catalog", root, dirs);
if (r < 0) {
- log_error_errno(-r, "Failed to get catalog files: %m");
+ log_error_errno(r, "Failed to get catalog files: %m");
goto finish;
}
r = write_catalog(database, h, sb, items, n);
if (r < 0)
- log_error_errno(-r, "Failed to write %s: %m", database);
+ log_error_errno(r, "Failed to write %s: %m", database);
else
log_debug("%s: wrote %u items, with %zu bytes of strings, %ld total size.",
database, n, sb->len, r);
r = make_filename(info, &fn);
if (r < 0) {
- log_error_errno(-r, "Failed to determine coredump file name: %m");
+ log_error_errno(r, "Failed to determine coredump file name: %m");
return r;
}
log_error("Not enough disk space for coredump of %s (%s), refusing.", info[INFO_PID], info[INFO_COMM]);
goto fail;
} else if (r < 0) {
- log_error_errno(-r, "Failed to dump coredump to file: %m");
+ log_error_errno(r, "Failed to dump coredump to file: %m");
goto fail;
}
r = compress_stream(fd, fd_compressed, -1);
if (r < 0) {
- log_error_errno(-r, "Failed to compress %s: %m", tmp_compressed);
+ log_error_errno(r, "Failed to compress %s: %m", tmp_compressed);
goto fail_compressed;
}
n = read(fd, field + 9, size);
if (n < 0) {
- log_error_errno(-n, "Failed to read core data: %m");
+ log_error_errno(n, "Failed to read core data: %m");
return (int) n;
}
if ((size_t) n < size) {
else if (r == -EINVAL)
log_warning("Failed to generate stack trace: %s", dwfl_errmsg(dwfl_errno()));
else
- log_warning_errno(-r, "Failed to generate stack trace: %m");
+ log_warning_errno(r, "Failed to generate stack trace: %m");
}
if (!core_message)
r = sd_journal_sendv(iovec, j);
if (r < 0)
- log_error_errno(-r, "Failed to log coredump: %m");
+ log_error_errno(r, "Failed to log coredump: %m");
finish:
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
r = set_consume(set, tmp);
if (r < 0) {
- log_error_errno(-r, "failed to add to set: %m");
+ log_error_errno(r, "failed to add to set: %m");
set_free(set);
return NULL;
}
log_debug("Adding pattern: %s", pattern);
r = set_consume(set, pattern);
if (r < 0) {
- log_error_errno(-r, "Failed to add pattern: %m");
+ log_error_errno(r, "Failed to add pattern: %m");
goto fail;
}
return 0;
fail:
- log_error_errno(-r, "Failed to add match: %m");
+ log_error_errno(r, "Failed to add match: %m");
return r;
}
r = sd_journal_get_realtime_usec(j, &t);
if (r < 0) {
- log_error_errno(-r, "Failed to get realtime timestamp: %m");
+ log_error_errno(r, "Failed to get realtime timestamp: %m");
return r;
}
if (r == 0)
r = sd_journal_previous(j);
if (r < 0) {
- log_error_errno(-r, "Failed to search journal: %m");
+ log_error_errno(r, "Failed to search journal: %m");
return r;
}
if (r == 0) {
* compressed file (probably uncached). */
r = sd_journal_get_data(j, "COREDUMP_FILENAME", (const void**) &data, &len);
if (r < 0 && r != -ENOENT)
- log_warning_errno(-r, "Failed to retrieve COREDUMP_FILENAME: %m");
+ log_warning_errno(r, "Failed to retrieve COREDUMP_FILENAME: %m");
else if (r == 0)
retrieve(data, len, "COREDUMP_FILENAME", &filename);
r = decompress_stream(filename, fdf, fd, -1);
if (r < 0) {
- log_error_errno(-r, "Failed to decompress %s: %m", filename);
+ log_error_errno(r, "Failed to decompress %s: %m", filename);
goto error;
}
#else
if (r == -ENOENT)
log_error("Cannot retrieve coredump from journal nor disk.");
else
- log_error_errno(-r, "Failed to retrieve COREDUMP field: %m");
+ log_error_errno(r, "Failed to retrieve COREDUMP field: %m");
goto error;
}
r = save_core(j, output ? fileno(output) : STDOUT_FILENO, NULL, NULL);
if (r < 0) {
- log_error_errno(-r, "Coredump retrieval failed: %m");
+ log_error_errno(r, "Coredump retrieval failed: %m");
return r;
}
r = sd_journal_get_data(j, "COREDUMP_EXE", (const void**) &data, &len);
if (r < 0) {
- log_error_errno(-r, "Failed to retrieve COREDUMP_EXE field: %m");
+ log_error_errno(r, "Failed to retrieve COREDUMP_EXE field: %m");
return r;
}
r = save_core(j, -1, &path, &unlink_path);
if (r < 0) {
- log_error_errno(-r, "Failed to retrieve core: %m");
+ log_error_errno(r, "Failed to retrieve core: %m");
return r;
}
r = sd_journal_open(&j, SD_JOURNAL_LOCAL_ONLY);
if (r < 0) {
- log_error_errno(-r, "Failed to open journal: %m");
+ log_error_errno(r, "Failed to open journal: %m");
goto end;
}
case ARG_FILE:
r = glob_extend(&arg_file, optarg);
if (r < 0) {
- log_error_errno(-r, "Failed to add paths: %m");
+ log_error_errno(r, "Failed to add paths: %m");
return r;
};
break;
r = sd_id128_randomize(&id);
if (r < 0) {
- log_error_errno(-r, "Failed to generate ID: %m");
+ log_error_errno(r, "Failed to generate ID: %m");
return r;
}
}
if (r < 0) {
- log_error_errno(-r, "Failed to add match '%s': %m", *i);
+ log_error_errno(r, "Failed to add match '%s': %m", *i);
return r;
}
}
r = get_boot_id_by_offset(j, &arg_boot_id, arg_boot_offset);
if (r < 0) {
if (sd_id128_equal(arg_boot_id, SD_ID128_NULL))
- log_error_errno(-r, "Failed to look up boot %+i: %m", arg_boot_offset);
+ log_error_errno(r, "Failed to look up boot %+i: %m", arg_boot_offset);
else
log_error("Failed to look up boot ID "SD_ID128_FORMAT_STR"%+i: %s",
SD_ID128_FORMAT_VAL(arg_boot_id), arg_boot_offset, strerror(-r));
r = sd_journal_add_match(j, match, sizeof(match) - 1);
if (r < 0) {
- log_error_errno(-r, "Failed to add match: %m");
+ log_error_errno(r, "Failed to add match: %m");
return r;
}
r = sd_journal_add_match(j, "_TRANSPORT=kernel", strlen("_TRANSPORT=kernel"));
if (r < 0) {
- log_error_errno(-r, "Failed to add match: %m");
+ log_error_errno(r, "Failed to add match: %m");
return r;
}
r = sd_journal_add_match(j, match, strlen(match));
if (r < 0) {
- log_error_errno(-r, "Failed to add match: %m");
+ log_error_errno(r, "Failed to add match: %m");
return r;
}
}
r = sd_id128_get_machine(&machine);
if (r < 0) {
- log_error_errno(-r, "Failed to get machine ID: %m");
+ log_error_errno(r, "Failed to get machine ID: %m");
return r;
}
r = sd_id128_get_boot(&boot);
if (r < 0) {
- log_error_errno(-r, "Failed to get boot ID: %m");
+ log_error_errno(r, "Failed to get boot ID: %m");
return r;
}
* daemon and set up inotify to wait for the flushed file to appear */
r = bus_open_system_systemd(&bus);
if (r < 0) {
- log_error_errno(-r, "Failed to get D-Bus connection: %m");
+ log_error_errno(r, "Failed to get D-Bus connection: %m");
return r;
}
r = fd_wait_for_event(watch_fd, POLLIN, USEC_INFINITY);
if (r < 0) {
- log_error_errno(-r, "Failed to wait for event: %m");
+ log_error_errno(r, "Failed to wait for event: %m");
return r;
}
r = flush_fd(watch_fd);
if (r < 0) {
- log_error_errno(-r, "Failed to flush inotify events: %m");
+ log_error_errno(r, "Failed to flush inotify events: %m");
return r;
}
}
if (arg_action == ACTION_UPDATE_CATALOG) {
r = catalog_update(database, arg_root, catalog_file_dirs);
if (r < 0)
- log_error_errno(-r, "Failed to list catalog: %m");
+ log_error_errno(r, "Failed to list catalog: %m");
} else {
bool oneline = arg_action == ACTION_LIST_CATALOG;
else
r = catalog_list(stdout, database, oneline);
if (r < 0)
- log_error_errno(-r, "Failed to list catalog: %m");
+ log_error_errno(r, "Failed to list catalog: %m");
}
goto finish;
q = journal_directory_vacuum(d->path, arg_vacuum_size, arg_vacuum_time, NULL, true);
if (q < 0) {
- log_error_errno(-q, "Failed to vacuum: %m");
+ log_error_errno(q, "Failed to vacuum: %m");
r = q;
}
}
strv_free(arg_user_units);
if (r < 0) {
- log_error_errno(-r, "Failed to add filter for units: %m");
+ log_error_errno(r, "Failed to add filter for units: %m");
return EXIT_FAILURE;
}
r = add_syslog_identifier(j);
if (r < 0) {
- log_error_errno(-r, "Failed to add filter for syslog identifiers: %m");
+ log_error_errno(r, "Failed to add filter for syslog identifiers: %m");
return EXIT_FAILURE;
}
r = add_priorities(j);
if (r < 0) {
- log_error_errno(-r, "Failed to add filter for priorities: %m");
+ log_error_errno(r, "Failed to add filter for priorities: %m");
return EXIT_FAILURE;
}
r = add_matches(j, argv + optind);
if (r < 0) {
- log_error_errno(-r, "Failed to add filters: %m");
+ log_error_errno(r, "Failed to add filters: %m");
return EXIT_FAILURE;
}
r = sd_journal_query_unique(j, arg_field);
if (r < 0) {
- log_error_errno(-r, "Failed to query unique data objects: %m");
+ log_error_errno(r, "Failed to query unique data objects: %m");
return EXIT_FAILURE;
}
if (arg_cursor || arg_after_cursor) {
r = sd_journal_seek_cursor(j, arg_cursor ?: arg_after_cursor);
if (r < 0) {
- log_error_errno(-r, "Failed to seek to cursor: %m");
+ log_error_errno(r, "Failed to seek to cursor: %m");
return EXIT_FAILURE;
}
if (!arg_reverse)
} else if (arg_since_set && !arg_reverse) {
r = sd_journal_seek_realtime_usec(j, arg_since);
if (r < 0) {
- log_error_errno(-r, "Failed to seek to date: %m");
+ log_error_errno(r, "Failed to seek to date: %m");
return EXIT_FAILURE;
}
r = sd_journal_next(j);
} else if (arg_until_set && arg_reverse) {
r = sd_journal_seek_realtime_usec(j, arg_until);
if (r < 0) {
- log_error_errno(-r, "Failed to seek to date: %m");
+ log_error_errno(r, "Failed to seek to date: %m");
return EXIT_FAILURE;
}
r = sd_journal_previous(j);
} else if (arg_lines >= 0) {
r = sd_journal_seek_tail(j);
if (r < 0) {
- log_error_errno(-r, "Failed to seek to tail: %m");
+ log_error_errno(r, "Failed to seek to tail: %m");
return EXIT_FAILURE;
}
} else if (arg_reverse) {
r = sd_journal_seek_tail(j);
if (r < 0) {
- log_error_errno(-r, "Failed to seek to tail: %m");
+ log_error_errno(r, "Failed to seek to tail: %m");
return EXIT_FAILURE;
}
} else {
r = sd_journal_seek_head(j);
if (r < 0) {
- log_error_errno(-r, "Failed to seek to head: %m");
+ log_error_errno(r, "Failed to seek to head: %m");
return EXIT_FAILURE;
}
}
if (r < 0) {
- log_error_errno(-r, "Failed to iterate through journal: %m");
+ log_error_errno(r, "Failed to iterate through journal: %m");
return EXIT_FAILURE;
}
r = sd_journal_get_cutoff_realtime_usec(j, &start, &end);
if (r < 0) {
- log_error_errno(-r, "Failed to get cutoff: %m");
+ log_error_errno(r, "Failed to get cutoff: %m");
goto finish;
}
else
r = sd_journal_previous(j);
if (r < 0) {
- log_error_errno(-r, "Failed to iterate through journal: %m");
+ log_error_errno(r, "Failed to iterate through journal: %m");
goto finish;
}
if (r == 0)
r = sd_journal_get_realtime_usec(j, &usec);
if (r < 0) {
- log_error_errno(-r, "Failed to determine timestamp: %m");
+ log_error_errno(r, "Failed to determine timestamp: %m");
goto finish;
}
if (usec > arg_until)
r = sd_journal_get_realtime_usec(j, &usec);
if (r < 0) {
- log_error_errno(-r, "Failed to determine timestamp: %m");
+ log_error_errno(r, "Failed to determine timestamp: %m");
goto finish;
}
if (usec < arg_since)
r = sd_journal_get_cursor(j, &cursor);
if (r < 0 && r != -EADDRNOTAVAIL)
- log_error_errno(-r, "Failed to get cursor: %m");
+ log_error_errno(r, "Failed to get cursor: %m");
else if (r >= 0)
printf("-- cursor: %s\n", cursor);
}
r = sd_journal_wait(j, (uint64_t) -1);
if (r < 0) {
- log_error_errno(-r, "Couldn't wait for journal event: %m");
+ log_error_errno(r, "Couldn't wait for journal event: %m");
goto finish;
}
r = m->map(m->journal_field, &v, iov, n_iov_allocated, n_iov);
if (r < 0) {
- log_debug_errno(-r, "Failed to parse audit array: %m");
+ log_debug_errno(r, "Failed to parse audit array: %m");
return r;
}
if (!mapped) {
r = map_generic_field(prefix, &p, iov, n_iov_allocated, n_iov);
if (r < 0) {
- log_debug_errno(-r, "Failed to parse audit array: %m");
+ log_debug_errno(r, "Failed to parse audit array: %m");
return r;
}
r = sd_event_add_io(s->event, &s->audit_event_source, s->audit_fd, EPOLLIN, process_datagram, s);
if (r < 0) {
- log_error_errno(-r, "Failed to add audit fd to event loop: %m");
+ log_error_errno(r, "Failed to add audit fd to event loop: %m");
return r;
}
/* We are listening now, try to enable audit */
r = enable_audit(s->audit_fd, true);
if (r < 0)
- log_warning_errno(-r, "Failed to issue audit enable call: %m");
+ log_warning_errno(r, "Failed to issue audit enable call: %m");
return 0;
}
goto fail;
}
- log_error_errno(-r, "Failed to add /dev/kmsg fd to event loop: %m");
+ log_error_errno(r, "Failed to add /dev/kmsg fd to event loop: %m");
goto fail;
}
r = sd_event_source_set_priority(s->dev_kmsg_event_source, SD_EVENT_PRIORITY_IMPORTANT+10);
if (r < 0) {
- log_error_errno(-r, "Failed to adjust priority of kmsg event source: %m");
+ log_error_errno(r, "Failed to adjust priority of kmsg event source: %m");
goto fail;
}
n = pread(fd, p, st.st_size, 0);
if (n < 0)
- log_error_errno(-n, "Failed to read file, ignoring: %m");
+ log_error_errno(n, "Failed to read file, ignoring: %m");
else if (n > 0)
server_process_native_message(s, p, n, ucred, tv, label, label_len);
}
r = sd_event_add_io(s->event, &s->native_event_source, s->native_fd, EPOLLIN, process_datagram, s);
if (r < 0) {
- log_error_errno(-r, "Failed to add native server fd to event loop: %m");
+ log_error_errno(r, "Failed to add native server fd to event loop: %m");
return r;
}
r = fchmod(f->fd, 0640);
if (r < 0)
- log_warning_errno(-r, "Failed to fix access mode on %s, ignoring: %m", f->path);
+ log_warning_errno(r, "Failed to fix access mode on %s, ignoring: %m", f->path);
#ifdef HAVE_ACL
if (uid <= SYSTEM_UID_MAX)
if (s->system_journal) {
r = journal_file_set_offline(s->system_journal);
if (r < 0)
- log_error_errno(-r, "Failed to sync system journal: %m");
+ log_error_errno(r, "Failed to sync system journal: %m");
}
ORDERED_HASHMAP_FOREACH_KEY(f, k, s->user_journals, i) {
r = journal_file_set_offline(f);
if (r < 0)
- log_error_errno(-r, "Failed to sync user journal: %m");
+ log_error_errno(r, "Failed to sync user journal: %m");
}
if (s->sync_event_source) {
r = sd_event_source_set_enabled(s->sync_event_source, SD_EVENT_OFF);
if (r < 0)
- log_error_errno(-r, "Failed to disable sync timer source: %m");
+ log_error_errno(r, "Failed to disable sync timer source: %m");
}
s->sync_scheduled = false;
p = strappenda(path, ids);
r = journal_directory_vacuum(p, metrics->max_use, s->max_retention_usec, &s->oldest_file_usec, false);
if (r < 0 && r != -ENOENT)
- log_error_errno(-r, "Failed to vacuum %s: %m", p);
+ log_error_errno(r, "Failed to vacuum %s: %m", p);
}
void server_vacuum(Server *s) {
r = sd_id128_get_machine(&machine);
if (r < 0) {
- log_error_errno(-r, "Failed to get machine ID: %m");
+ log_error_errno(r, "Failed to get machine ID: %m");
return;
}
sd_id128_to_string(machine, ids);
for (i = 0; i < n; i++)
size += iovec[i].iov_len;
- log_error_errno(-r, "Failed to write entry (%d items, %zu bytes), ignoring: %m", n, size);
+ log_error_errno(r, "Failed to write entry (%d items, %zu bytes), ignoring: %m", n, size);
return;
}
for (i = 0; i < n; i++)
size += iovec[i].iov_len;
- log_error_errno(-r, "Failed to write entry (%d items, %zu bytes) despite vacuuming, ignoring: %m", n, size);
+ log_error_errno(r, "Failed to write entry (%d items, %zu bytes) despite vacuuming, ignoring: %m", n, size);
} else
server_schedule_sync(s, priority);
}
r = sd_id128_get_machine(&machine);
if (r < 0) {
- log_error_errno(-r, "Failed to get machine id: %m");
+ log_error_errno(r, "Failed to get machine id: %m");
return r;
}
server_fix_perms(s, s->system_journal, 0);
else if (r < 0) {
if (r != -ENOENT && r != -EROFS)
- log_warning_errno(-r, "Failed to open system journal: %m");
+ log_warning_errno(r, "Failed to open system journal: %m");
r = 0;
}
if (r < 0) {
if (r != -ENOENT)
- log_warning_errno(-r, "Failed to open runtime journal: %m");
+ log_warning_errno(r, "Failed to open runtime journal: %m");
r = 0;
}
free(fn);
if (r < 0) {
- log_error_errno(-r, "Failed to open runtime journal: %m");
+ log_error_errno(r, "Failed to open runtime journal: %m");
return r;
}
}
r = sd_journal_open(&j, SD_JOURNAL_RUNTIME_ONLY);
if (r < 0) {
- log_error_errno(-r, "Failed to read runtime journal: %m");
+ log_error_errno(r, "Failed to read runtime journal: %m");
return r;
}
r = journal_file_move_to_object(f, OBJECT_ENTRY, f->current_offset, &o);
if (r < 0) {
- log_error_errno(-r, "Can't read entry: %m");
+ log_error_errno(r, "Can't read entry: %m");
goto finish;
}
continue;
if (!shall_try_append_again(s->system_journal, r)) {
- log_error_errno(-r, "Can't write entry: %m");
+ log_error_errno(r, "Can't write entry: %m");
goto finish;
}
log_debug("Retrying write.");
r = journal_file_copy_entry(f, s->system_journal, o, f->current_offset, NULL, NULL, NULL);
if (r < 0) {
- log_error_errno(-r, "Can't write entry: %m");
+ log_error_errno(r, "Can't write entry: %m");
goto finish;
}
}
r = proc_cmdline(&line);
if (r < 0) {
- log_warning_errno(-r, "Failed to read /proc/cmdline, ignoring: %m");
+ log_warning_errno(r, "Failed to read /proc/cmdline, ignoring: %m");
return 0;
}
return 0;
}
- log_error_errno(-r, "Failed to register hostname fd in event loop: %m");
+ log_error_errno(r, "Failed to register hostname fd in event loop: %m");
return r;
}
r = sd_event_source_set_priority(s->hostname_event_source, SD_EVENT_PRIORITY_IMPORTANT-10);
if (r < 0) {
- log_error_errno(-r, "Failed to adjust priority of host name event source: %m");
+ log_error_errno(r, "Failed to adjust priority of host name event source: %m");
return r;
}
r = sd_event_default(&s->event);
if (r < 0) {
- log_error_errno(-r, "Failed to create event loop: %m");
+ log_error_errno(r, "Failed to create event loop: %m");
return r;
}
n = sd_listen_fds(true);
if (n < 0) {
- log_error_errno(-n, "Failed to read listening file descriptors from environment: %m");
+ log_error_errno(n, "Failed to read listening file descriptors from environment: %m");
return n;
}
r = sd_event_add_io(s->event, &stream->event_source, fd, EPOLLIN, stdout_stream_process, stream);
if (r < 0) {
- log_error_errno(-r, "Failed to add stream to event loop: %m");
+ log_error_errno(r, "Failed to add stream to event loop: %m");
goto fail;
}
r = sd_event_source_set_priority(stream->event_source, SD_EVENT_PRIORITY_NORMAL+5);
if (r < 0) {
- log_error_errno(-r, "Failed to adjust stdout event source priority: %m");
+ log_error_errno(r, "Failed to adjust stdout event source priority: %m");
goto fail;
}
r = sd_event_add_io(s->event, &s->stdout_event_source, s->stdout_fd, EPOLLIN, stdout_stream_new, s);
if (r < 0) {
- log_error_errno(-r, "Failed to add stdout server fd to event source: %m");
+ log_error_errno(r, "Failed to add stdout server fd to event source: %m");
return r;
}
r = sd_event_source_set_priority(s->stdout_event_source, SD_EVENT_PRIORITY_NORMAL+10);
if (r < 0) {
- log_error_errno(-r, "Failed to adjust priority of stdout server event source: %m");
+ log_error_errno(r, "Failed to adjust priority of stdout server event source: %m");
return r;
}
r = sd_event_add_io(s->event, &s->syslog_event_source, s->syslog_fd, EPOLLIN, process_datagram, s);
if (r < 0) {
- log_error_errno(-r, "Failed to add syslog server fd to event loop: %m");
+ log_error_errno(r, "Failed to add syslog server fd to event loop: %m");
return r;
}
r = utmp_wall(l, "systemd-journald", NULL);
if (r < 0)
- log_debug_errno(-r, "Failed to send wall message: %m");
+ log_debug_errno(r, "Failed to send wall message: %m");
}
r = sd_event_run(server.event, t);
if (r < 0) {
- log_error_errno(-r, "Failed to run event loop: %m");
+ log_error_errno(r, "Failed to run event loop: %m");
goto finish;
}
r = next_beyond_location(j, f, direction, &o, &p);
if (r < 0) {
- log_debug_errno(-r, "Can't iterate through %s, ignoring: %m", f->path);
+ log_debug_errno(r, "Can't iterate through %s, ignoring: %m", f->path);
remove_file_real(j, f);
continue;
} else if (r == 0)
r = add_directory(j, m->path, de->d_name);
if (r < 0)
- log_debug_errno(-r, "Failed to add directory %s/%s: %m", m->path, de->d_name);
+ log_debug_errno(r, "Failed to add directory %s/%s: %m", m->path, de->d_name);
}
}
STRV_FOREACH(path, paths) {
r = add_any_file(j, *path);
if (r < 0) {
- log_error_errno(-r, "Failed to open %s: %m", *path);
+ log_error_errno(r, "Failed to open %s: %m", *path);
goto fail;
}
}
r = remove_file(j, d->path, e->name);
if (r < 0)
- log_debug_errno(-r, "Failed to remove file %s/%s: %m", d->path, e->name);
+ log_debug_errno(r, "Failed to remove file %s/%s: %m", d->path, e->name);
}
} else if (!d->is_root && e->len == 0) {
if (e->mask & (IN_DELETE_SELF|IN_MOVE_SELF|IN_UNMOUNT)) {
r = remove_directory(j, d);
if (r < 0)
- log_debug_errno(-r, "Failed to remove directory %s: %m", d->path);
+ log_debug_errno(r, "Failed to remove directory %s: %m", d->path);
}
if (e->mask & (IN_CREATE|IN_MOVED_TO|IN_MODIFY|IN_ATTRIB)) {
r = add_directory(j, d->path, e->name);
if (r < 0)
- log_debug_errno(-r, "Failed to add directory %s/%s: %m", d->path, e->name);
+ log_debug_errno(r, "Failed to add directory %s/%s: %m", d->path, e->name);
}
}
r = compress(data, data_len, compressed, &csize);
if (r == -ENOBUFS) {
- log_info_errno(-r, "compression failed: %m");
+ log_info_errno(r, "compression failed: %m");
assert(may_fail);
} else {
assert(r == 0);
r = compress(data, data_len, compressed, &csize);
if (r == -ENOBUFS) {
- log_info_errno(-r, "compression failed: %m");
+ log_info_errno(r, "compression failed: %m");
assert(may_fail);
return;
}
finish:
if (r < 0)
- log_error_errno(-r, "Failed to save lease data %s: %m", lease_file);
+ log_error_errno(r, "Failed to save lease data %s: %m", lease_file);
return r;
}
if (r == -ENOENT)
return 0;
- log_error_errno(-r, "Failed to read %s: %m", lease_file);
+ log_error_errno(r, "Failed to read %s: %m", lease_file);
return r;
}
case PPPOE_STATE_INITIALIZING:
r = pppoe_send_initiation(ppp);
if (r < 0)
- log_warning_errno(-r, "PPPoE: sending PADI failed: %m");
+ log_warning_errno(r, "PPPoE: sending PADI failed: %m");
break;
case PPPOE_STATE_REQUESTING:
r = pppoe_send_initiation(ppp);
if (r < 0)
- log_warning_errno(-r, "PPPoE: sending PADI failed: %m");
+ log_warning_errno(r, "PPPoE: sending PADI failed: %m");
ppp->padr_resend_count = PPPOE_MAX_PADR_RESEND;
ppp->state = PPPOE_STATE_INITIALIZING;
} else {
r = pppoe_send_request(ppp);
if (r < 0)
- log_warning_errno(-r, "PPPoE: sending PADR failed: %m");
+ log_warning_errno(r, "PPPoE: sending PADR failed: %m");
}
break;
len = recvfrom(fd, packet, buflen, 0, &link.sa, &addrlen);
if (len < 0) {
- log_warning_errno(-r, "PPPoE: could not receive message from raw socket: %m");
+ log_warning_errno(r, "PPPoE: could not receive message from raw socket: %m");
return 0;
} else if ((size_t)len < sizeof(struct pppoe_hdr))
return 0;
r = sd_pid_get_session(getpid(), &e->session);
if (r < 0) {
- log_error_errno(-r, "Cannot retrieve logind session: %m");
+ log_error_errno(r, "Cannot retrieve logind session: %m");
return r;
}
r = sd_session_get_seat(e->session, &e->seat);
if (r < 0) {
- log_error_errno(-r, "Cannot retrieve seat of logind session: %m");
+ log_error_errno(r, "Cannot retrieve seat of logind session: %m");
return r;
}
evcat_idev_fn,
e);
if (r < 0) {
- log_error_errno(-r, "Cannot create idev session: %m");
+ log_error_errno(r, "Cannot create idev session: %m");
return r;
}
if (e->managed) {
r = sysview_session_take_control(ev->session_add.session);
if (r < 0) {
- log_error_errno(-r, "Cannot request session control: %m");
+ log_error_errno(r, "Cannot request session control: %m");
return r;
}
}
if (type == SYSVIEW_DEVICE_EVDEV) {
r = idev_session_add_evdev(e->idev_session, sysview_device_get_ud(d));
if (r < 0) {
- log_error_errno(-r, "Cannot add evdev device to idev: %m");
+ log_error_errno(r, "Cannot add evdev device to idev: %m");
return r;
}
}
if (type == SYSVIEW_DEVICE_EVDEV) {
r = idev_session_remove_evdev(e->idev_session, sysview_device_get_ud(d));
if (r < 0) {
- log_error_errno(-r, "Cannot remove evdev device from idev: %m");
+ log_error_errno(r, "Cannot remove evdev device from idev: %m");
return r;
}
}
case SYSVIEW_EVENT_SESSION_CONTROL:
r = ev->session_control.error;
if (r < 0) {
- log_error_errno(-r, "Cannot acquire session control: %m");
+ log_error_errno(r, "Cannot acquire session control: %m");
return r;
}
error:
if (r < 0)
- log_debug_errno(-r, "idev-keyboard: cannot parse locale property from locale1: %m");
+ log_debug_errno(r, "idev-keyboard: cannot parse locale property from locale1: %m");
return r;
}
return 0;
error:
- log_debug_errno(-r, "idev-keyboard: cannot send GetAll to locale1: %m");
+ log_debug_errno(r, "idev-keyboard: cannot send GetAll to locale1: %m");
return r;
}
return 0;
error:
- log_debug_errno(-r, "idev-keyboard: cannot handle PropertiesChanged from locale1: %m");
+ log_debug_errno(r, "idev-keyboard: cannot handle PropertiesChanged from locale1: %m");
return r;
}
kbdctx_locale_props_changed_fn,
kc);
if (r < 0) {
- log_debug_errno(-r, "idev-keyboard: cannot setup locale1 link: %m");
+ log_debug_errno(r, "idev-keyboard: cannot setup locale1 link: %m");
return r;
}
r = sd_pid_get_session(getpid(), &m->session);
if (r < 0) {
- log_error_errno(-r, "Cannot retrieve logind session: %m");
+ log_error_errno(r, "Cannot retrieve logind session: %m");
return r;
}
r = sd_session_get_seat(m->session, &m->seat);
if (r < 0) {
- log_error_errno(-r, "Cannot retrieve seat of logind session: %m");
+ log_error_errno(r, "Cannot retrieve seat of logind session: %m");
return r;
}
modeset_grdev_fn,
m);
if (r < 0) {
- log_error_errno(-r, "Cannot create grdev session: %m");
+ log_error_errno(r, "Cannot create grdev session: %m");
return r;
}
if (m->managed) {
r = sysview_session_take_control(ev->session_add.session);
if (r < 0) {
- log_error_errno(-r, "Cannot request session control: %m");
+ log_error_errno(r, "Cannot request session control: %m");
return r;
}
}
case SYSVIEW_EVENT_SESSION_CONTROL:
r = ev->session_control.error;
if (r < 0) {
- log_error_errno(-r, "Cannot acquire session control: %m");
+ log_error_errno(r, "Cannot acquire session control: %m");
return r;
}
len = loop_write(o->fd, o->obuf, o->n_obuf, false);
if (len < 0) {
- log_error_errno(-len, "error: cannot write to TTY (%zd): %m", len);
+ log_error_errno(len, "error: cannot write to TTY (%zd): %m", len);
return len;
}
len = loop_write(o->fd, buf, size, false);
if (len < 0) {
- log_error_errno(-len, "error: cannot write to TTY (%zd): %m", len);
+ log_error_errno(len, "error: cannot write to TTY (%zd): %m", len);
return len;
}
if (t->pty) {
r = pty_resize(t->pty, t->output->in_width, t->output->in_height);
if (r < 0)
- log_error_errno(-r, "error: pty_resize() (%d): %m", r);
+ log_error_errno(r, "error: pty_resize() (%d): %m", r);
}
r = term_screen_resize(t->screen, t->output->in_width, t->output->in_height);
if (r < 0)
- log_error_errno(-r, "error: term_screen_resize() (%d): %m", r);
+ log_error_errno(r, "error: term_screen_resize() (%d): %m", r);
terminal_dirty(t);
for (i = 0; i < num; ++i) {
r = pty_write(t->pty, vec[i].iov_base, vec[i].iov_len);
if (r < 0) {
- log_error_errno(-r, "error: cannot write to PTY (%d): %m", r);
+ log_error_errno(r, "error: cannot write to PTY (%d): %m", r);
return r;
}
}
for (j = 0; j < n_str; ++j) {
type = term_parser_feed(t->parser, &seq, str[j]);
if (type < 0) {
- log_error_errno(-type, "error: term_parser_feed() (%d): %m", type);
+ log_error_errno(type, "error: term_parser_feed() (%d): %m", type);
return type;
}
case PTY_DATA:
r = term_screen_feed_text(t->screen, ptr, size);
if (r < 0) {
- log_error_errno(-r, "error: term_screen_feed_text() (%d): %m", r);
+ log_error_errno(r, "error: term_screen_feed_text() (%d): %m", r);
return r;
}
r = tcsetattr(t->in_fd, TCSANOW, &in_attr);
if (r < 0) {
- log_error_errno(-r, "error: tcsetattr() (%d): %m", r);
+ log_error_errno(r, "error: tcsetattr() (%d): %m", r);
goto error;
}
r = tcsetattr(t->out_fd, TCSANOW, &out_attr);
if (r < 0) {
- log_error_errno(-r, "error: tcsetattr() (%d): %m", r);
+ log_error_errno(r, "error: tcsetattr() (%d): %m", r);
goto error;
}
r = sd_event_default(&t->event);
if (r < 0) {
- log_error_errno(-r, "error: sd_event_default() (%d): %m", r);
+ log_error_errno(r, "error: sd_event_default() (%d): %m", r);
goto error;
}
r = sigprocmask_many(SIG_BLOCK, SIGINT, SIGQUIT, SIGTERM, SIGWINCH, SIGCHLD, -1);
if (r < 0) {
- log_error_errno(-r, "error: sigprocmask_many() (%d): %m", r);
+ log_error_errno(r, "error: sigprocmask_many() (%d): %m", r);
goto error;
}
r = sd_event_add_signal(t->event, NULL, SIGINT, NULL, NULL);
if (r < 0) {
- log_error_errno(-r, "error: sd_event_add_signal() (%d): %m", r);
+ log_error_errno(r, "error: sd_event_add_signal() (%d): %m", r);
goto error;
}
r = sd_event_add_signal(t->event, NULL, SIGQUIT, NULL, NULL);
if (r < 0) {
- log_error_errno(-r, "error: sd_event_add_signal() (%d): %m", r);
+ log_error_errno(r, "error: sd_event_add_signal() (%d): %m", r);
goto error;
}
r = sd_event_add_signal(t->event, NULL, SIGTERM, NULL, NULL);
if (r < 0) {
- log_error_errno(-r, "error: sd_event_add_signal() (%d): %m", r);
+ log_error_errno(r, "error: sd_event_add_signal() (%d): %m", r);
goto error;
}
r = sd_event_add_signal(t->event, NULL, SIGWINCH, terminal_winch_fn, t);
if (r < 0) {
- log_error_errno(-r, "error: sd_event_add_signal() (%d): %m", r);
+ log_error_errno(r, "error: sd_event_add_signal() (%d): %m", r);
goto error;
}
t->is_dirty = true;
r = sd_event_add_time(t->event, &t->frame_timer, CLOCK_MONOTONIC, 0, 0, terminal_frame_timer_fn, t);
if (r < 0) {
- log_error_errno(-r, "error: sd_event_add_time() (%d): %m", r);
+ log_error_errno(r, "error: sd_event_add_time() (%d): %m", r);
goto error;
}
r = term_screen_resize(t->screen, t->output->in_width, t->output->in_height);
if (r < 0) {
- log_error_errno(-r, "error: term_screen_resize() (%d): %m", r);
+ log_error_errno(r, "error: term_screen_resize() (%d): %m", r);
goto error;
}
pid = pty_fork(&t->pty, t->event, terminal_pty_fn, t, t->output->in_width, t->output->in_height);
if (pid < 0) {
- log_error_errno(-pid, "error: cannot fork PTY (%d): %m", pid);
+ log_error_errno(pid, "error: cannot fork PTY (%d): %m", pid);
return pid;
} else if (pid == 0) {
/* child */
out:
if (r < 0)
- log_error_errno(-r, "error: terminal failed (%d): %m", r);
+ log_error_errno(r, "error: terminal failed (%d): %m", r);
terminal_free(t);
return -r;
}
if (!c->scanned) {
r = context_ld_scan(c);
if (r < 0) {
- log_debug_errno(-r, "sysview: logind scan failed: %m");
+ log_debug_errno(r, "sysview: logind scan failed: %m");
return r;
}
}
if (hashmap_size(c->session_map) > 0) {
r = context_ud_scan(c);
if (r < 0) {
- log_debug_errno(-r, "sysview: udev scan failed: %m");
+ log_debug_errno(r, "sysview: udev scan failed: %m");
return r;
}
r = sd_bus_message_rewind(m, !(flags & BUS_MESSAGE_DUMP_SUBTREE_ONLY));
if (r < 0) {
- log_error_errno(-r, "Failed to rewind: %m");
+ log_error_errno(r, "Failed to rewind: %m");
return r;
}
r = sd_bus_message_peek_type(m, &type, &contents);
if (r < 0) {
- log_error_errno(-r, "Failed to peek type: %m");
+ log_error_errno(r, "Failed to peek type: %m");
return r;
}
r = sd_bus_message_exit_container(m);
if (r < 0) {
- log_error_errno(-r, "Failed to exit container: %m");
+ log_error_errno(r, "Failed to exit container: %m");
return r;
}
if (bus_type_is_container(type) > 0) {
r = sd_bus_message_enter_container(m, type, contents);
if (r < 0) {
- log_error_errno(-r, "Failed to enter container: %m");
+ log_error_errno(r, "Failed to enter container: %m");
return r;
}
r = sd_bus_message_read_basic(m, type, &basic);
if (r < 0) {
- log_error_errno(-r, "Failed to get basic: %m");
+ log_error_errno(r, "Failed to get basic: %m");
return r;
}
/* Anybody can send us invalid messages, let's just drop them. */
if (r == -EBADMSG || r == -EPROTOTYPE)
- log_debug_errno(-r, "Ignoring invalid message: %m");
+ log_debug_errno(r, "Ignoring invalid message: %m");
else
return r;
}
/* Anybody can send us invalid messages, let's just drop them. */
if (r == -EBADMSG || r == -EPROTOTYPE) {
- log_debug_errno(-r, "Ignoring invalid message: %m");
+ log_debug_errno(r, "Ignoring invalid message: %m");
r = 0;
}
r = track->handler(track, track->userdata);
if (r < 0)
- log_debug_errno(-r, "Failed to process track handler: %m");
+ log_debug_errno(r, "Failed to process track handler: %m");
else if (r == 0)
bus_track_add_to_queue(track);
#endif
int bus_log_parse_error(int r) {
- log_error_errno(-r, "Failed to parse bus message: %m");
+ log_error_errno(r, "Failed to parse bus message: %m");
return r;
}
int bus_log_create_error(int r) {
- log_error_errno(-r, "Failed to create bus message: %m");
+ log_error_errno(r, "Failed to create bus message: %m");
return r;
}
r = sd_bus_list_names(bus, (arg_acquired || arg_unique) ? &acquired : NULL, arg_activatable ? &activatable : NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to list names: %m");
+ log_error_errno(r, "Failed to list names: %m");
return r;
}
r = hashmap_put(names, *i, NAME_IS_ACQUIRED);
if (r < 0) {
- log_error_errno(-r, "Failed to add to hashmap: %m");
+ log_error_errno(r, "Failed to add to hashmap: %m");
return r;
}
}
r = hashmap_put(names, *i, NAME_IS_ACTIVATABLE);
if (r < 0 && r != -EEXIST) {
- log_error_errno(-r, "Failed to add to hashmap: %m");
+ log_error_errno(r, "Failed to add to hashmap: %m");
return r;
}
}
r = sd_bus_list_names(bus, &names, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to get name list: %m");
+ log_error_errno(r, "Failed to get name list: %m");
return r;
}
r = sd_bus_add_match(bus, NULL, m, NULL, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to add match: %m");
+ log_error_errno(r, "Failed to add match: %m");
return r;
}
STRV_FOREACH(i, arg_matches) {
r = sd_bus_add_match(bus, NULL, *i, NULL, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to add match: %m");
+ log_error_errno(r, "Failed to add match: %m");
return r;
}
if (!added_something) {
r = sd_bus_add_match(bus, NULL, "", NULL, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to add match: %m");
+ log_error_errno(r, "Failed to add match: %m");
return r;
}
}
r = sd_bus_process(bus, &m);
if (r < 0) {
- log_error_errno(-r, "Failed to process bus: %m");
+ log_error_errno(r, "Failed to process bus: %m");
return r;
}
r = sd_bus_wait(bus, (uint64_t) -1);
if (r < 0) {
- log_error_errno(-r, "Failed to wait for bus: %m");
+ log_error_errno(r, "Failed to wait for bus: %m");
return r;
}
}
&creds);
if (r < 0) {
- log_error_errno(-r, "Failed to get credentials: %m");
+ log_error_errno(r, "Failed to get credentials: %m");
return r;
}
r = sd_bus_new(&bus);
if (r < 0) {
- log_error_errno(-r, "Failed to allocate bus: %m");
+ log_error_errno(r, "Failed to allocate bus: %m");
goto finish;
}
r = sd_bus_set_monitor(bus, true);
if (r < 0) {
- log_error_errno(-r, "Failed to set monitor mode: %m");
+ log_error_errno(r, "Failed to set monitor mode: %m");
goto finish;
}
r = sd_bus_negotiate_creds(bus, true, _SD_BUS_CREDS_ALL);
if (r < 0) {
- log_error_errno(-r, "Failed to enable credentials: %m");
+ log_error_errno(r, "Failed to enable credentials: %m");
goto finish;
}
r = sd_bus_negotiate_timestamp(bus, true);
if (r < 0) {
- log_error_errno(-r, "Failed to enable timestamps: %m");
+ log_error_errno(r, "Failed to enable timestamps: %m");
goto finish;
}
r = sd_bus_negotiate_fds(bus, true);
if (r < 0) {
- log_error_errno(-r, "Failed to enable fds: %m");
+ log_error_errno(r, "Failed to enable fds: %m");
goto finish;
}
}
else {
r = sd_bus_set_bus_client(bus, true);
if (r < 0) {
- log_error_errno(-r, "Failed to set bus client: %m");
+ log_error_errno(r, "Failed to set bus client: %m");
goto finish;
}
}
}
if (r < 0) {
- log_error_errno(-r, "Failed to set address: %m");
+ log_error_errno(r, "Failed to set address: %m");
goto finish;
}
r = sd_bus_start(bus);
if (r < 0) {
- log_error_errno(-r, "Failed to connect to bus: %m");
+ log_error_errno(r, "Failed to connect to bus: %m");
goto finish;
}
r = sd_bus_reply_method_return(m, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to send reply: %m");
+ log_error_errno(r, "Failed to send reply: %m");
return r;
}
r = sd_bus_open_user(&bus);
if (r < 0) {
- log_error_errno(-r, "Failed to connect to user bus: %m");
+ log_error_errno(r, "Failed to connect to user bus: %m");
goto fail;
}
r = sd_bus_get_owner_id(bus, &id);
if (r < 0) {
- log_error_errno(-r, "Failed to get server ID: %m");
+ log_error_errno(r, "Failed to get server ID: %m");
goto fail;
}
r = sd_bus_get_unique_name(bus, &unique);
if (r < 0) {
- log_error_errno(-r, "Failed to get unique name: %m");
+ log_error_errno(r, "Failed to get unique name: %m");
goto fail;
}
r = sd_bus_request_name(bus, "org.freedesktop.systemd.test", 0);
if (r < 0) {
- log_error_errno(-r, "Failed to acquire name: %m");
+ log_error_errno(r, "Failed to acquire name: %m");
goto fail;
}
r = sd_bus_add_fallback(bus, NULL, "/foo/bar", object_callback, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to add object: %m");
+ log_error_errno(r, "Failed to add object: %m");
goto fail;
}
r = sd_bus_add_match(bus, NULL, "type='signal',interface='foo.bar',member='Notify'", match_callback, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to add match: %m");
+ log_error_errno(r, "Failed to add match: %m");
goto fail;
}
r = sd_bus_add_match(bus, NULL, "type='signal',interface='org.freedesktop.DBus',member='NameOwnerChanged'", match_callback, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to add match: %m");
+ log_error_errno(r, "Failed to add match: %m");
goto fail;
}
r = sd_bus_process(bus, &m);
if (r < 0) {
- log_error_errno(-r, "Failed to process requests: %m");
+ log_error_errno(r, "Failed to process requests: %m");
goto fail;
}
if (r == 0) {
r = sd_bus_wait(bus, (uint64_t) -1);
if (r < 0) {
- log_error_errno(-r, "Failed to wait: %m");
+ log_error_errno(r, "Failed to wait: %m");
goto fail;
}
r = sd_bus_message_read(m, "s", &hello);
if (r < 0) {
- log_error_errno(-r, "Failed to get parameter: %m");
+ log_error_errno(r, "Failed to get parameter: %m");
goto fail;
}
r = sd_bus_reply_method_return(m, "s", lowercase);
if (r < 0) {
- log_error_errno(-r, "Failed to send reply: %m");
+ log_error_errno(r, "Failed to send reply: %m");
goto fail;
}
} else if (sd_bus_message_is_method_call(m, "org.freedesktop.systemd.test", "ExitClient1")) {
r = sd_bus_reply_method_return(m, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to send reply: %m");
+ log_error_errno(r, "Failed to send reply: %m");
goto fail;
}
r = sd_bus_reply_method_return(m, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to send reply: %m");
+ log_error_errno(r, "Failed to send reply: %m");
goto fail;
}
r = sd_bus_reply_method_return(m, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to send reply: %m");
+ log_error_errno(r, "Failed to send reply: %m");
goto fail;
}
r = sd_bus_message_read(m, "h", &fd);
if (r < 0) {
- log_error_errno(-r, "Failed to get parameter: %m");
+ log_error_errno(r, "Failed to get parameter: %m");
goto fail;
}
r = sd_bus_reply_method_return(m, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to send reply: %m");
+ log_error_errno(r, "Failed to send reply: %m");
goto fail;
}
m,
&SD_BUS_ERROR_MAKE_CONST(SD_BUS_ERROR_UNKNOWN_METHOD, "Unknown method."));
if (r < 0) {
- log_error_errno(-r, "Failed to send reply: %m");
+ log_error_errno(r, "Failed to send reply: %m");
goto fail;
}
}
r = sd_bus_open_user(&bus);
if (r < 0) {
- log_error_errno(-r, "Failed to connect to user bus: %m");
+ log_error_errno(r, "Failed to connect to user bus: %m");
goto finish;
}
"s",
"HELLO");
if (r < 0) {
- log_error_errno(-r, "Failed to issue method call: %m");
+ log_error_errno(r, "Failed to issue method call: %m");
goto finish;
}
r = sd_bus_message_read(reply, "s", &hello);
if (r < 0) {
- log_error_errno(-r, "Failed to get string: %m");
+ log_error_errno(r, "Failed to get string: %m");
goto finish;
}
"h",
pp[1]);
if (r < 0) {
- log_error_errno(-r, "Failed to issue method call: %m");
+ log_error_errno(r, "Failed to issue method call: %m");
goto finish;
}
"org.freedesktop.systemd.test",
"ExitClient1");
if (r < 0)
- log_error_errno(-r, "Failed to allocate method call: %m");
+ log_error_errno(r, "Failed to allocate method call: %m");
else
sd_bus_send(bus, q, NULL);
r = sd_bus_open_user(&bus);
if (r < 0) {
- log_error_errno(-r, "Failed to connect to user bus: %m");
+ log_error_errno(r, "Failed to connect to user bus: %m");
goto finish;
}
"org.object.test",
"Foobar");
if (r < 0) {
- log_error_errno(-r, "Failed to allocate method call: %m");
+ log_error_errno(r, "Failed to allocate method call: %m");
goto finish;
}
"foo.bar",
"Notify");
if (r < 0) {
- log_error_errno(-r, "Failed to allocate signal: %m");
+ log_error_errno(r, "Failed to allocate signal: %m");
goto finish;
}
"org.freedesktop.DBus.Peer",
"GetMachineId");
if (r < 0) {
- log_error_errno(-r, "Failed to allocate method call: %m");
+ log_error_errno(r, "Failed to allocate method call: %m");
goto finish;
}
r = sd_bus_message_read(reply, "s", &mid);
if (r < 0) {
- log_error_errno(-r, "Failed to parse machine ID: %m");
+ log_error_errno(r, "Failed to parse machine ID: %m");
goto finish;
}
"org.freedesktop.systemd.test",
"Slow");
if (r < 0) {
- log_error_errno(-r, "Failed to allocate method call: %m");
+ log_error_errno(r, "Failed to allocate method call: %m");
goto finish;
}
"org.freedesktop.systemd.test",
"Slow");
if (r < 0) {
- log_error_errno(-r, "Failed to allocate method call: %m");
+ log_error_errno(r, "Failed to allocate method call: %m");
goto finish;
}
while (!quit) {
r = sd_bus_process(bus, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to process requests: %m");
+ log_error_errno(r, "Failed to process requests: %m");
goto finish;
}
if (r == 0) {
r = sd_bus_wait(bus, (uint64_t) -1);
if (r < 0) {
- log_error_errno(-r, "Failed to wait: %m");
+ log_error_errno(r, "Failed to wait: %m");
goto finish;
}
}
"org.freedesktop.systemd.test",
"ExitClient2");
if (r < 0) {
- log_error_errno(-r, "Failed to allocate method call: %m");
+ log_error_errno(r, "Failed to allocate method call: %m");
goto finish;
}
r = sd_bus_process(bus, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to process requests: %m");
+ log_error_errno(r, "Failed to process requests: %m");
goto fail;
}
if (r == 0) {
r = sd_bus_wait(bus, (uint64_t) -1);
if (r < 0) {
- log_error_errno(-r, "Failed to wait: %m");
+ log_error_errno(r, "Failed to wait: %m");
goto fail;
}
r = sd_bus_process(bus, &m);
if (r < 0) {
- log_error_errno(-r, "Failed to process requests: %m");
+ log_error_errno(r, "Failed to process requests: %m");
goto fail;
}
if (r == 0) {
r = sd_bus_wait(bus, (uint64_t) -1);
if (r < 0) {
- log_error_errno(-r, "Failed to wait: %m");
+ log_error_errno(r, "Failed to wait: %m");
goto fail;
}
r = sd_bus_message_new_method_return(m, &reply);
if (r < 0) {
- log_error_errno(-r, "Failed to allocate return: %m");
+ log_error_errno(r, "Failed to allocate return: %m");
goto fail;
}
&reply,
&SD_BUS_ERROR_MAKE_CONST(SD_BUS_ERROR_UNKNOWN_METHOD, "Unknown method."));
if (r < 0) {
- log_error_errno(-r, "Failed to allocate return: %m");
+ log_error_errno(r, "Failed to allocate return: %m");
goto fail;
}
}
if (reply) {
r = sd_bus_send(bus, reply, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to send reply: %m");
+ log_error_errno(r, "Failed to send reply: %m");
goto fail;
}
}
"org.freedesktop.systemd.test",
"Exit");
if (r < 0) {
- log_error_errno(-r, "Failed to allocate method call: %m");
+ log_error_errno(r, "Failed to allocate method call: %m");
return r;
}
if (r < 0) {
if (s->description)
- log_debug_errno(-r, "Event source '%s' returned error, disabling: %m", s->description);
+ log_debug_errno(r, "Event source '%s' returned error, disabling: %m", s->description);
else
- log_debug_errno(-r, "Event source %p returned error, disabling: %m", s);
+ log_debug_errno(r, "Event source %p returned error, disabling: %m", s);
}
if (s->n_ref == 0)
if (r < 0) {
if (s->description)
- log_debug_errno(-r, "Prepare callback of event source '%s' returned error, disabling: %m", s->description);
+ log_debug_errno(r, "Prepare callback of event source '%s' returned error, disabling: %m", s->description);
else
- log_debug_errno(-r, "Prepare callback of event source %p returned error, disabling: %m", s);
+ log_debug_errno(r, "Prepare callback of event source %p returned error, disabling: %m", s);
}
if (s->n_ref == 0)
}
int rtnl_log_parse_error(int r) {
- log_error_errno(-r, "Failed to parse netlink message: %m");
+ log_error_errno(r, "Failed to parse netlink message: %m");
return r;
}
int rtnl_log_create_error(int r) {
- log_error_errno(-r, "Failed to create netlink message: %m");
+ log_error_errno(r, "Failed to create netlink message: %m");
return r;
}
r = sd_rtnl_message_new_route(NULL, &req, RTM_NEWROUTE, AF_INET, RTPROT_STATIC);
if (r < 0) {
- log_error_errno(-r, "Could not create RTM_NEWROUTE message: %m");
+ log_error_errno(r, "Could not create RTM_NEWROUTE message: %m");
return;
}
r = sd_rtnl_message_append_in_addr(req, RTA_GATEWAY, &addr);
if (r < 0) {
- log_error_errno(-r, "Could not append RTA_GATEWAY attribute: %m");
+ log_error_errno(r, "Could not append RTA_GATEWAY attribute: %m");
return;
}
r = sd_rtnl_message_append_u32(req, RTA_OIF, index);
if (r < 0) {
- log_error_errno(-r, "Could not append RTA_OIF attribute: %m");
+ log_error_errno(r, "Could not append RTA_OIF attribute: %m");
return;
}
r = sd_rtnl_message_get_errno(m);
- log_info_errno(-r, "%d left in pipe. got reply: %m", *counter);
+ log_info_errno(r, "%d left in pipe. got reply: %m", *counter);
assert_se(r >= 0);
NULL);
if (r < 0 && r != -ENOENT) {
- log_warning_errno(-r, "Failed to read /proc/cmdline: %m");
+ log_warning_errno(r, "Failed to read /proc/cmdline: %m");
goto finish;
}
map,
&info);
if (r < 0) {
- log_error_errno(-r, "Could not get properties: %m");
+ log_error_errno(r, "Could not get properties: %m");
goto fail;
}
r = get_locales(&l);
if (r < 0) {
- log_error_errno(-r, "Failed to read list of locales: %m");
+ log_error_errno(r, "Failed to read list of locales: %m");
return r;
}
r = set_consume(keymaps, p);
if (r < 0 && r != -EEXIST) {
- log_error_errno(-r, "Can't add keymap: %m");
+ log_error_errno(r, "Can't add keymap: %m");
return r;
}
r = bus_open_transport(arg_transport, arg_host, false, &bus);
if (r < 0) {
- log_error_errno(-r, "Failed to create bus connection: %m");
+ log_error_errno(r, "Failed to create bus connection: %m");
goto finish;
}
r = sd_bus_call(bus, m, 0, &error, NULL);
if (r < 0)
- log_error_errno(-r, "Failed to update the manager environment: %m");
+ log_error_errno(r, "Failed to update the manager environment: %m");
return 0;
}
r = x11_write_data(c);
if (r < 0) {
- log_error_errno(-r, "Failed to set X11 keyboard layout: %m");
+ log_error_errno(r, "Failed to set X11 keyboard layout: %m");
return r;
}
if (modified) {
r = vconsole_write_data(c);
if (r < 0)
- log_error_errno(-r, "Failed to set virtual console keymap: %m");
+ log_error_errno(r, "Failed to set virtual console keymap: %m");
log_info("Changed virtual console keymap to '%s' toggle '%s'",
strempty(c->vc_keymap), strempty(c->vc_keymap_toggle));
r = locale_write_data(c, &settings);
if (r < 0) {
- log_error_errno(-r, "Failed to set locale: %m");
+ log_error_errno(r, "Failed to set locale: %m");
return sd_bus_error_set_errnof(error, r, "Failed to set locale: %s", strerror(-r));
}
r = vconsole_write_data(c);
if (r < 0) {
- log_error_errno(-r, "Failed to set virtual console keymap: %m");
+ log_error_errno(r, "Failed to set virtual console keymap: %m");
return sd_bus_error_set_errnof(error, r, "Failed to set virtual console keymap: %s", strerror(-r));
}
r = vconsole_reload(bus);
if (r < 0)
- log_error_errno(-r, "Failed to request keymap reload: %m");
+ log_error_errno(r, "Failed to request keymap reload: %m");
sd_bus_emit_properties_changed(bus,
"/org/freedesktop/locale1",
if (convert) {
r = vconsole_convert_to_x11(c, bus);
if (r < 0)
- log_error_errno(-r, "Failed to convert keymap data: %m");
+ log_error_errno(r, "Failed to convert keymap data: %m");
}
}
r = x11_write_data(c);
if (r < 0) {
- log_error_errno(-r, "Failed to set X11 keyboard layout: %m");
+ log_error_errno(r, "Failed to set X11 keyboard layout: %m");
return sd_bus_error_set_errnof(error, r, "Failed to set X11 keyboard layout: %s", strerror(-r));
}
if (convert) {
r = x11_convert_to_vconsole(c, bus);
if (r < 0)
- log_error_errno(-r, "Failed to convert keymap data: %m");
+ log_error_errno(r, "Failed to convert keymap data: %m");
}
}
r = sd_bus_default_system(&bus);
if (r < 0) {
- log_error_errno(-r, "Failed to get system bus connection: %m");
+ log_error_errno(r, "Failed to get system bus connection: %m");
return r;
}
r = sd_bus_add_object_vtable(bus, NULL, "/org/freedesktop/locale1", "org.freedesktop.locale1", locale_vtable, c);
if (r < 0) {
- log_error_errno(-r, "Failed to register object: %m");
+ log_error_errno(r, "Failed to register object: %m");
return r;
}
r = sd_bus_request_name(bus, "org.freedesktop.locale1", 0);
if (r < 0) {
- log_error_errno(-r, "Failed to register name: %m");
+ log_error_errno(r, "Failed to register name: %m");
return r;
}
r = sd_bus_attach_event(bus, event, 0);
if (r < 0) {
- log_error_errno(-r, "Failed to attach bus to event loop: %m");
+ log_error_errno(r, "Failed to attach bus to event loop: %m");
return r;
}
r = sd_event_default(&event);
if (r < 0) {
- log_error_errno(-r, "Failed to allocate event loop: %m");
+ log_error_errno(r, "Failed to allocate event loop: %m");
goto finish;
}
r = context_read_data(&context);
if (r < 0) {
- log_error_errno(-r, "Failed to read locale data: %m");
+ log_error_errno(r, "Failed to read locale data: %m");
goto finish;
}
r = bus_event_loop_with_idle(event, bus, "org.freedesktop.locale1", DEFAULT_EXIT_USEC, NULL, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to run event loop: %m");
+ log_error_errno(r, "Failed to run event loop: %m");
goto finish;
}
r = sd_bus_default_system(&bus);
if (r < 0) {
- log_error_errno(-r, "Failed to connect to bus: %m");
+ log_error_errno(r, "Failed to connect to bus: %m");
return EXIT_FAILURE;
}
r = bus_map_all_properties(bus, "org.freedesktop.login1", path, map, &i);
if (r < 0) {
- log_error_errno(-r, "Could not get properties: %m");
+ log_error_errno(r, "Could not get properties: %m");
return r;
}
r = bus_map_all_properties(bus, "org.freedesktop.login1", path, map, &i);
if (r < 0) {
- log_error_errno(-r, "Could not get properties: %m");
+ log_error_errno(r, "Could not get properties: %m");
goto finish;
}
r = bus_map_all_properties(bus, "org.freedesktop.login1", path, map, &i);
if (r < 0) {
- log_error_errno(-r, "Could not get properties: %m");
+ log_error_errno(r, "Could not get properties: %m");
goto finish;
}
r = bus_print_all_properties(bus, "org.freedesktop.login1", path, arg_property, arg_all);
if (r < 0)
- log_error_errno(-r, "Could not get properties: %m");
+ log_error_errno(r, "Could not get properties: %m");
return r;
}
r = get_user_creds((const char**) (args+i), &uid, NULL, NULL, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to look up user %s: %m", args[i]);
+ log_error_errno(r, "Failed to look up user %s: %m", args[i]);
return r;
}
r = get_user_creds((const char**) (args+i), &uid, NULL, NULL, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to look up user %s: %m", args[i]);
+ log_error_errno(r, "Failed to look up user %s: %m", args[i]);
return r;
}
r = get_user_creds((const char**) (args+i), &uid, NULL, NULL, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to look up user %s: %m", args[i]);
+ log_error_errno(r, "Failed to look up user %s: %m", args[i]);
return r;
}
r = get_user_creds((const char**) (args+i), &uid, NULL, NULL, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to look up user %s: %m", args[i]);
+ log_error_errno(r, "Failed to look up user %s: %m", args[i]);
return r;
}
r = bus_open_transport(arg_transport, arg_host, false, &bus);
if (r < 0) {
- log_error_errno(-r, "Failed to create bus connection: %m");
+ log_error_errno(r, "Failed to create bus connection: %m");
goto finish;
}
r = sd_event_add_io(b->manager->event, &b->io_event_source, b->fd, EPOLLIN, button_dispatch, b);
if (r < 0) {
- log_error_errno(-r, "Failed to add button event: %m");
+ log_error_errno(r, "Failed to add button event: %m");
goto fail;
}
* assume that we are docked. */
n = manager_count_displays(m);
if (n < 0)
- log_warning_errno(-n, "Display counting failed: %m");
+ log_warning_errno(n, "Display counting failed: %m");
else if (n > 1) {
log_debug("Multiple (%i) displays connected.", n);
return true;
finish:
if (r < 0)
- log_error_errno(-r, "Failed to save inhibit data %s: %m", i->state_file);
+ log_error_errno(r, "Failed to save inhibit data %s: %m", i->state_file);
return r;
}
finish:
if (r < 0)
- log_error_errno(-r, "Failed to save seat data %s: %m", s->state_file);
+ log_error_errno(r, "Failed to save seat data %s: %m", s->state_file);
return r;
}
q = vt_allocate(i);
if (q < 0) {
- log_error_errno(-q, "Failed to preallocate VT %i: %m", i);
+ log_error_errno(q, "Failed to preallocate VT %i: %m", i);
r = q;
}
}
!!s->active, s->active ? s->active->user->uid : 0);
if (r < 0)
- log_error_errno(-r, "Failed to apply ACLs: %m");
+ log_error_errno(r, "Failed to apply ACLs: %m");
return r;
}
finish:
if (r < 0)
- log_error_errno(-r, "Failed to save session data %s: %m", s->state_file);
+ log_error_errno(r, "Failed to save session data %s: %m", s->state_file);
return r;
}
NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to read %s: %m", s->state_file);
+ log_error_errno(r, "Failed to read %s: %m", s->state_file);
return r;
}
finish:
if (r < 0)
- log_error_errno(-r, "Failed to save user data %s: %m", u->state_file);
+ log_error_errno(r, "Failed to save user data %s: %m", u->state_file);
return r;
}
if (r == -ENOENT)
return 0;
- log_error_errno(-r, "Failed to read %s: %m", u->state_file);
+ log_error_errno(r, "Failed to read %s: %m", u->state_file);
return r;
}
r = mkdir_safe_label("/run/user", 0755, 0, 0);
if (r < 0) {
- log_error_errno(-r, "Failed to create /run/user: %m");
+ log_error_errno(r, "Failed to create /run/user: %m");
return r;
}
r = mount("tmpfs", p, "tmpfs", MS_NODEV|MS_NOSUID, t);
if (r < 0) {
- log_error_errno(-r, "Failed to mount per-user tmpfs directory %s: %m", p);
+ log_error_errno(r, "Failed to mount per-user tmpfs directory %s: %m", p);
goto fail;
}
}
r = rm_rf(u->runtime_path, false, false, false);
if (r < 0)
- log_error_errno(-r, "Failed to remove runtime directory %s: %m", u->runtime_path);
+ log_error_errno(r, "Failed to remove runtime directory %s: %m", u->runtime_path);
if (umount2(u->runtime_path, MNT_DETACH) < 0)
log_error("Failed to unmount user runtime directory %s: %m", u->runtime_path);
r = rm_rf(u->runtime_path, false, true, false);
if (r < 0)
- log_error_errno(-r, "Failed to remove runtime directory %s: %m", u->runtime_path);
+ log_error_errno(r, "Failed to remove runtime directory %s: %m", u->runtime_path);
free(u->runtime_path);
u->runtime_path = NULL;
k = manager_add_user_by_name(m, de->d_name, NULL);
if (k < 0) {
- log_notice_errno(-k, "Couldn't add lingering user %s: %m", de->d_name);
+ log_notice_errno(k, "Couldn't add lingering user %s: %m", de->d_name);
r = k;
}
}
k = manager_add_user_by_name(m, de->d_name, &u);
if (k < 0) {
- log_error_errno(-k, "Failed to add user by file name %s: %m", de->d_name);
+ log_error_errno(k, "Failed to add user by file name %s: %m", de->d_name);
r = k;
continue;
k = manager_add_session(m, de->d_name, &s);
if (k < 0) {
- log_error_errno(-k, "Failed to add session by file name %s: %m", de->d_name);
+ log_error_errno(k, "Failed to add session by file name %s: %m", de->d_name);
r = k;
continue;
k = manager_add_inhibitor(m, de->d_name, &i);
if (k < 0) {
- log_notice_errno(-k, "Couldn't add inhibitor %s: %m", de->d_name);
+ log_notice_errno(k, "Couldn't add inhibitor %s: %m", de->d_name);
r = k;
continue;
}
r = sd_bus_default_system(&m->bus);
if (r < 0) {
- log_error_errno(-r, "Failed to connect to system bus: %m");
+ log_error_errno(r, "Failed to connect to system bus: %m");
return r;
}
r = sd_bus_add_object_vtable(m->bus, NULL, "/org/freedesktop/login1", "org.freedesktop.login1.Manager", manager_vtable, m);
if (r < 0) {
- log_error_errno(-r, "Failed to add manager object vtable: %m");
+ log_error_errno(r, "Failed to add manager object vtable: %m");
return r;
}
r = sd_bus_add_fallback_vtable(m->bus, NULL, "/org/freedesktop/login1/seat", "org.freedesktop.login1.Seat", seat_vtable, seat_object_find, m);
if (r < 0) {
- log_error_errno(-r, "Failed to add seat object vtable: %m");
+ log_error_errno(r, "Failed to add seat object vtable: %m");
return r;
}
r = sd_bus_add_node_enumerator(m->bus, NULL, "/org/freedesktop/login1/seat", seat_node_enumerator, m);
if (r < 0) {
- log_error_errno(-r, "Failed to add seat enumerator: %m");
+ log_error_errno(r, "Failed to add seat enumerator: %m");
return r;
}
r = sd_bus_add_fallback_vtable(m->bus, NULL, "/org/freedesktop/login1/session", "org.freedesktop.login1.Session", session_vtable, session_object_find, m);
if (r < 0) {
- log_error_errno(-r, "Failed to add session object vtable: %m");
+ log_error_errno(r, "Failed to add session object vtable: %m");
return r;
}
r = sd_bus_add_node_enumerator(m->bus, NULL, "/org/freedesktop/login1/session", session_node_enumerator, m);
if (r < 0) {
- log_error_errno(-r, "Failed to add session enumerator: %m");
+ log_error_errno(r, "Failed to add session enumerator: %m");
return r;
}
r = sd_bus_add_fallback_vtable(m->bus, NULL, "/org/freedesktop/login1/user", "org.freedesktop.login1.User", user_vtable, user_object_find, m);
if (r < 0) {
- log_error_errno(-r, "Failed to add user object vtable: %m");
+ log_error_errno(r, "Failed to add user object vtable: %m");
return r;
}
r = sd_bus_add_node_enumerator(m->bus, NULL, "/org/freedesktop/login1/user", user_node_enumerator, m);
if (r < 0) {
- log_error_errno(-r, "Failed to add user enumerator: %m");
+ log_error_errno(r, "Failed to add user enumerator: %m");
return r;
}
"path='/org/freedesktop/DBus'",
match_name_owner_changed, m);
if (r < 0) {
- log_error_errno(-r, "Failed to add match for NameOwnerChanged: %m");
+ log_error_errno(r, "Failed to add match for NameOwnerChanged: %m");
return r;
}
"path='/org/freedesktop/systemd1'",
match_job_removed, m);
if (r < 0) {
- log_error_errno(-r, "Failed to add match for JobRemoved: %m");
+ log_error_errno(r, "Failed to add match for JobRemoved: %m");
return r;
}
"path='/org/freedesktop/systemd1'",
match_unit_removed, m);
if (r < 0) {
- log_error_errno(-r, "Failed to add match for UnitRemoved: %m");
+ log_error_errno(r, "Failed to add match for UnitRemoved: %m");
return r;
}
"member='PropertiesChanged'",
match_properties_changed, m);
if (r < 0) {
- log_error_errno(-r, "Failed to add match for PropertiesChanged: %m");
+ log_error_errno(r, "Failed to add match for PropertiesChanged: %m");
return r;
}
"path='/org/freedesktop/systemd1'",
match_reloading, m);
if (r < 0) {
- log_error_errno(-r, "Failed to add match for Reloading: %m");
+ log_error_errno(r, "Failed to add match for Reloading: %m");
return r;
}
r = sd_bus_request_name(m->bus, "org.freedesktop.login1", 0);
if (r < 0) {
- log_error_errno(-r, "Failed to register name: %m");
+ log_error_errno(r, "Failed to register name: %m");
return r;
}
r = sd_bus_attach_event(m->bus, m->event, 0);
if (r < 0) {
- log_error_errno(-r, "Failed to attach bus to event loop: %m");
+ log_error_errno(r, "Failed to attach bus to event loop: %m");
return r;
}
r = ignore_signals(SIGRTMIN + 1, -1);
if (r < 0) {
- log_error_errno(-r, "Cannot ignore SIGRTMIN + 1: %m");
+ log_error_errno(r, "Cannot ignore SIGRTMIN + 1: %m");
return r;
}
r = sigprocmask_many(SIG_BLOCK, SIGRTMIN, -1);
if (r < 0) {
- log_error_errno(-r, "Cannot block SIGRTMIN: %m");
+ log_error_errno(r, "Cannot block SIGRTMIN: %m");
return r;
}
elapse, USEC_PER_SEC*30,
manager_dispatch_idle_action, m);
if (r < 0) {
- log_error_errno(-r, "Failed to add idle event source: %m");
+ log_error_errno(r, "Failed to add idle event source: %m");
return r;
}
r = sd_event_source_set_priority(m->idle_action_event_source, SD_EVENT_PRIORITY_IDLE+10);
if (r < 0) {
- log_error_errno(-r, "Failed to set idle event source priority: %m");
+ log_error_errno(r, "Failed to set idle event source priority: %m");
return r;
}
} else {
r = sd_event_source_set_time(m->idle_action_event_source, elapse);
if (r < 0) {
- log_error_errno(-r, "Failed to set idle event timer: %m");
+ log_error_errno(r, "Failed to set idle event timer: %m");
return r;
}
r = sd_event_source_set_enabled(m->idle_action_event_source, SD_EVENT_ONESHOT);
if (r < 0) {
- log_error_errno(-r, "Failed to enable idle event timer: %m");
+ log_error_errno(r, "Failed to enable idle event timer: %m");
return r;
}
}
/* Connect to udev */
r = manager_connect_udev(m);
if (r < 0) {
- log_error_errno(-r, "Failed to create udev watchers: %m");
+ log_error_errno(r, "Failed to create udev watchers: %m");
return r;
}
/* Instantiate magic seat 0 */
r = manager_add_seat(m, "seat0", &m->seat0);
if (r < 0) {
- log_error_errno(-r, "Failed to add seat0: %m");
+ log_error_errno(r, "Failed to add seat0: %m");
return r;
}
r = manager_set_lid_switch_ignore(m, 0 + IGNORE_LID_SWITCH_STARTUP_USEC);
if (r < 0)
- log_warning_errno(-r, "Failed to set up lid switch ignore event source: %m");
+ log_warning_errno(r, "Failed to set up lid switch ignore event source: %m");
/* Deserialize state */
r = manager_enumerate_devices(m);
if (r < 0)
- log_warning_errno(-r, "Device enumeration failed: %m");
+ log_warning_errno(r, "Device enumeration failed: %m");
r = manager_enumerate_seats(m);
if (r < 0)
- log_warning_errno(-r, "Seat enumeration failed: %m");
+ log_warning_errno(r, "Seat enumeration failed: %m");
r = manager_enumerate_users(m);
if (r < 0)
- log_warning_errno(-r, "User enumeration failed: %m");
+ log_warning_errno(r, "User enumeration failed: %m");
r = manager_enumerate_sessions(m);
if (r < 0)
- log_warning_errno(-r, "Session enumeration failed: %m");
+ log_warning_errno(r, "Session enumeration failed: %m");
r = manager_enumerate_inhibitors(m);
if (r < 0)
- log_warning_errno(-r, "Inhibitor enumeration failed: %m");
+ log_warning_errno(r, "Inhibitor enumeration failed: %m");
r = manager_enumerate_buttons(m);
if (r < 0)
- log_warning_errno(-r, "Button enumeration failed: %m");
+ log_warning_errno(r, "Button enumeration failed: %m");
/* Remove stale objects before we start them */
manager_gc(m, false);
r = manager_startup(m);
if (r < 0) {
- log_error_errno(-r, "Failed to fully start up daemon: %m");
+ log_error_errno(r, "Failed to fully start up daemon: %m");
goto finish;
}
r = write_string_file_atomic("/run/nologin", "System is going down.");
if (r < 0) {
- log_error_errno(-r, "Failed to create /run/nologin: %m");
+ log_error_errno(r, "Failed to create /run/nologin: %m");
return EXIT_FAILURE;
}
if (temp_path)
unlink(temp_path);
- log_error_errno(-r, "Failed to save machine data %s: %m", m->state_file);
+ log_error_errno(r, "Failed to save machine data %s: %m", m->state_file);
}
return r;
if (r == -ENOENT)
return 0;
- log_error_errno(-r, "Failed to read %s: %m", m->state_file);
+ log_error_errno(r, "Failed to read %s: %m", m->state_file);
return r;
}
map,
&info);
if (r < 0) {
- log_error_errno(-r, "Could not get properties: %m");
+ log_error_errno(r, "Could not get properties: %m");
return r;
}
r = bus_print_all_properties(bus, "org.freedesktop.machine1", path, arg_property, arg_all);
if (r < 0)
- log_error_errno(-r, "Could not get properties: %m");
+ log_error_errno(r, "Could not get properties: %m");
return r;
}
r = sd_event_default(&event);
if (r < 0) {
- log_error_errno(-r, "Failed to get event loop: %m");
+ log_error_errno(r, "Failed to get event loop: %m");
return r;
}
r = sd_bus_attach_event(bus, event, 0);
if (r < 0) {
- log_error_errno(-r, "Failed to attach bus to event loop: %m");
+ log_error_errno(r, "Failed to attach bus to event loop: %m");
return r;
}
&reply2,
"u");
if (r < 0) {
- log_error_errno(-r, "Failed to retrieve PID of leader: %m");
+ log_error_errno(r, "Failed to retrieve PID of leader: %m");
return r;
}
master = openpt_in_namespace(leader, O_RDWR|O_NOCTTY|O_CLOEXEC|O_NDELAY);
if (master < 0) {
- log_error_errno(-master, "Failed to acquire pseudo tty: %m");
+ log_error_errno(master, "Failed to acquire pseudo tty: %m");
return master;
}
r = sd_bus_open_system_container(&container_bus, args[1]);
if (r < 0) {
- log_error_errno(-r, "Failed to get container bus: %m");
+ log_error_errno(r, "Failed to get container bus: %m");
return r;
}
r = pty_forward_new(event, master, &forward);
if (r < 0) {
- log_error_errno(-r, "Failed to create PTY forwarder: %m");
+ log_error_errno(r, "Failed to create PTY forwarder: %m");
return r;
}
r = sd_event_loop(event);
if (r < 0) {
- log_error_errno(-r, "Failed to run event loop: %m");
+ log_error_errno(r, "Failed to run event loop: %m");
return r;
}
r = bus_open_transport(arg_transport, arg_host, false, &bus);
if (r < 0) {
- log_error_errno(-r, "Failed to create bus connection: %m");
+ log_error_errno(r, "Failed to create bus connection: %m");
goto finish;
}
k = manager_add_machine(m, de->d_name, &machine);
if (k < 0) {
- log_error_errno(-k, "Failed to add machine by file name %s: %m", de->d_name);
+ log_error_errno(k, "Failed to add machine by file name %s: %m", de->d_name);
r = k;
continue;
r = sd_bus_default_system(&m->bus);
if (r < 0) {
- log_error_errno(-r, "Failed to connect to system bus: %m");
+ log_error_errno(r, "Failed to connect to system bus: %m");
return r;
}
r = sd_bus_add_object_vtable(m->bus, NULL, "/org/freedesktop/machine1", "org.freedesktop.machine1.Manager", manager_vtable, m);
if (r < 0) {
- log_error_errno(-r, "Failed to add manager object vtable: %m");
+ log_error_errno(r, "Failed to add manager object vtable: %m");
return r;
}
r = sd_bus_add_fallback_vtable(m->bus, NULL, "/org/freedesktop/machine1/machine", "org.freedesktop.machine1.Machine", machine_vtable, machine_object_find, m);
if (r < 0) {
- log_error_errno(-r, "Failed to add machine object vtable: %m");
+ log_error_errno(r, "Failed to add machine object vtable: %m");
return r;
}
r = sd_bus_add_node_enumerator(m->bus, NULL, "/org/freedesktop/machine1/machine", machine_node_enumerator, m);
if (r < 0) {
- log_error_errno(-r, "Failed to add machine enumerator: %m");
+ log_error_errno(r, "Failed to add machine enumerator: %m");
return r;
}
match_job_removed,
m);
if (r < 0) {
- log_error_errno(-r, "Failed to add match for JobRemoved: %m");
+ log_error_errno(r, "Failed to add match for JobRemoved: %m");
return r;
}
match_unit_removed,
m);
if (r < 0) {
- log_error_errno(-r, "Failed to add match for UnitRemoved: %m");
+ log_error_errno(r, "Failed to add match for UnitRemoved: %m");
return r;
}
match_properties_changed,
m);
if (r < 0) {
- log_error_errno(-r, "Failed to add match for PropertiesChanged: %m");
+ log_error_errno(r, "Failed to add match for PropertiesChanged: %m");
return r;
}
match_reloading,
m);
if (r < 0) {
- log_error_errno(-r, "Failed to add match for Reloading: %m");
+ log_error_errno(r, "Failed to add match for Reloading: %m");
return r;
}
r = sd_bus_request_name(m->bus, "org.freedesktop.machine1", 0);
if (r < 0) {
- log_error_errno(-r, "Failed to register name: %m");
+ log_error_errno(r, "Failed to register name: %m");
return r;
}
r = sd_bus_attach_event(m->bus, m->event, 0);
if (r < 0) {
- log_error_errno(-r, "Failed to attach bus to event loop: %m");
+ log_error_errno(r, "Failed to attach bus to event loop: %m");
return r;
}
r = manager_startup(m);
if (r < 0) {
- log_error_errno(-r, "Failed to fully start up daemon: %m");
+ log_error_errno(r, "Failed to fully start up daemon: %m");
goto finish;
}
r = kmod_module_new_from_lookup(ctx, m, &modlist);
if (r < 0) {
- log_error_errno(-r, "Failed to lookup alias '%s': %m", m);
+ log_error_errno(r, "Failed to lookup alias '%s': %m", m);
return r;
}
if (ignore_enoent && r == -ENOENT)
return 0;
- log_error_errno(-r, "Failed to open %s, ignoring: %m", path);
+ log_error_errno(r, "Failed to open %s, ignoring: %m", path);
return r;
}
r = parse_proc_cmdline(parse_proc_cmdline_item);
if (r < 0)
- log_warning_errno(-r, "Failed to parse kernel command line, ignoring: %m");
+ log_warning_errno(r, "Failed to parse kernel command line, ignoring: %m");
ctx = kmod_new(NULL, NULL);
if (!ctx) {
k = conf_files_list_nulstr(&files, ".conf", NULL, conf_file_dirs);
if (k < 0) {
- log_error_errno(-k, "Failed to enumerate modules-load.d files: %m");
+ log_error_errno(k, "Failed to enumerate modules-load.d files: %m");
if (r == 0)
r = k;
goto finish;
r = sd_rtnl_open(&rtnl, 0);
if (r < 0) {
- log_error_errno(-r, "Failed to connect to netlink: %m");
+ log_error_errno(r, "Failed to connect to netlink: %m");
return r;
}
r = sd_rtnl_call(rtnl, req, 0, &reply);
if (r < 0) {
- log_error_errno(-r, "Failed to enumerate links: %m");
+ log_error_errno(r, "Failed to enumerate links: %m");
return r;
}
r = sd_rtnl_call(rtnl, req, 0, &reply);
if (r < 0) {
- log_error_errno(-r, "Failed to query link: %m");
+ log_error_errno(r, "Failed to query link: %m");
return r;
}
r = sd_rtnl_open(&rtnl, 0);
if (r < 0) {
- log_error_errno(-r, "Failed to connect to netlink: %m");
+ log_error_errno(r, "Failed to connect to netlink: %m");
return r;
}
r = sd_rtnl_call(rtnl, req, 0, &reply);
if (r < 0) {
- log_error_errno(-r, "Failed to enumerate links: %m");
+ log_error_errno(r, "Failed to enumerate links: %m");
return r;
}
r = sd_rtnl_message_addr_set_prefixlen(req, address->prefixlen);
if (r < 0) {
- log_error_errno(-r, "Could not set prefixlen: %m");
+ log_error_errno(r, "Could not set prefixlen: %m");
return r;
}
r = sd_rtnl_call_async(link->manager->rtnl, req, callback, link, 0, NULL);
if (r < 0) {
- log_error_errno(-r, "Could not send rtnetlink message: %m");
+ log_error_errno(r, "Could not send rtnetlink message: %m");
return r;
}
r = sd_rtnl_message_addr_set_prefixlen(req, address->prefixlen);
if (r < 0) {
- log_error_errno(-r, "Could not set prefixlen: %m");
+ log_error_errno(r, "Could not set prefixlen: %m");
return r;
}
r = sd_rtnl_message_addr_set_flags(req, IFA_F_PERMANENT);
if (r < 0) {
- log_error_errno(-r, "Could not set flags: %m");
+ log_error_errno(r, "Could not set flags: %m");
return r;
}
r = sd_rtnl_message_addr_set_scope(req, address->scope);
if (r < 0) {
- log_error_errno(-r, "Could not set scope: %m");
+ log_error_errno(r, "Could not set scope: %m");
return r;
}
r = sd_rtnl_call_async(link->manager->rtnl, req, callback, link, 0, NULL);
if (r < 0) {
- log_error_errno(-r, "Could not send rtnetlink message: %m");
+ log_error_errno(r, "Could not send rtnetlink message: %m");
return r;
}
r = sd_rtnl_message_addr_set_prefixlen(req, address->prefixlen);
if (r < 0) {
- log_error_errno(-r, "Could not set prefixlen: %m");
+ log_error_errno(r, "Could not set prefixlen: %m");
return r;
}
r = sd_rtnl_message_addr_set_flags(req, IFA_F_PERMANENT);
if (r < 0) {
- log_error_errno(-r, "Could not set flags: %m");
+ log_error_errno(r, "Could not set flags: %m");
return r;
}
r = sd_rtnl_message_addr_set_scope(req, address->scope);
if (r < 0) {
- log_error_errno(-r, "Could not set scope: %m");
+ log_error_errno(r, "Could not set scope: %m");
return r;
}
r = sd_rtnl_call_async(link->manager->rtnl, req, callback, link, 0, NULL);
if (r < 0) {
- log_error_errno(-r, "Could not send rtnetlink message: %m");
+ log_error_errno(r, "Could not send rtnetlink message: %m");
return r;
}
r = udev_monitor_filter_add_match_subsystem_devtype(m->udev_monitor, "net", NULL);
if (r < 0) {
- log_error_errno(-r, "Could not add udev monitor filter: %m");
+ log_error_errno(r, "Could not add udev monitor filter: %m");
return r;
}
return 0;
fail:
- log_error_errno(-r, "Failed to save network state to %s: %m", m->state_file);
+ log_error_errno(r, "Failed to save network state to %s: %m", m->state_file);
unlink(m->state_file);
unlink(temp_path);
return r;
if (v->ifname_peer) {
r = sd_rtnl_message_append_string(m, IFLA_IFNAME, v->ifname_peer);
if (r < 0) {
- log_error_errno(-r, "Failed to add netlink interface name: %m");
+ log_error_errno(r, "Failed to add netlink interface name: %m");
return r;
}
}
r = conf_files_list_strv(&files, ".netdev", NULL, network_dirs);
if (r < 0) {
- log_error_errno(-r, "Failed to enumerate netdev files: %m");
+ log_error_errno(r, "Failed to enumerate netdev files: %m");
return r;
}
r = conf_files_list_strv(&files, ".network", NULL, network_dirs);
if (r < 0) {
- log_error_errno(-r, "Failed to enumerate network files: %m");
+ log_error_errno(r, "Failed to enumerate network files: %m");
return r;
}
RTM_DELROUTE, route->family,
route->protocol);
if (r < 0) {
- log_error_errno(-r, "Could not create RTM_DELROUTE message: %m");
+ log_error_errno(r, "Could not create RTM_DELROUTE message: %m");
return r;
}
else if (route->family == AF_INET6)
r = sd_rtnl_message_append_in6_addr(req, RTA_GATEWAY, &route->in_addr.in6);
if (r < 0) {
- log_error_errno(-r, "Could not append RTA_GATEWAY attribute: %m");
+ log_error_errno(r, "Could not append RTA_GATEWAY attribute: %m");
return r;
}
}
else if (route->family == AF_INET6)
r = sd_rtnl_message_append_in6_addr(req, RTA_DST, &route->dst_addr.in6);
if (r < 0) {
- log_error_errno(-r, "Could not append RTA_DST attribute: %m");
+ log_error_errno(r, "Could not append RTA_DST attribute: %m");
return r;
}
r = sd_rtnl_message_route_set_dst_prefixlen(req, route->dst_prefixlen);
if (r < 0) {
- log_error_errno(-r, "Could not set destination prefix length: %m");
+ log_error_errno(r, "Could not set destination prefix length: %m");
return r;
}
}
else if (route->family == AF_INET6)
r = sd_rtnl_message_append_in6_addr(req, RTA_PREFSRC, &route->prefsrc_addr.in6);
if (r < 0) {
- log_error_errno(-r, "Could not append RTA_PREFSRC attribute: %m");
+ log_error_errno(r, "Could not append RTA_PREFSRC attribute: %m");
return r;
}
}
r = sd_rtnl_message_route_set_scope(req, route->scope);
if (r < 0) {
- log_error_errno(-r, "Could not set scope: %m");
+ log_error_errno(r, "Could not set scope: %m");
return r;
}
r = sd_rtnl_message_append_u32(req, RTA_PRIORITY, route->metrics);
if (r < 0) {
- log_error_errno(-r, "Could not append RTA_PRIORITY attribute: %m");
+ log_error_errno(r, "Could not append RTA_PRIORITY attribute: %m");
return r;
}
r = sd_rtnl_message_append_u32(req, RTA_OIF, link->ifindex);
if (r < 0) {
- log_error_errno(-r, "Could not append RTA_OIF attribute: %m");
+ log_error_errno(r, "Could not append RTA_OIF attribute: %m");
return r;
}
r = sd_rtnl_call_async(link->manager->rtnl, req, callback, link, 0, NULL);
if (r < 0) {
- log_error_errno(-r, "Could not send rtnetlink message: %m");
+ log_error_errno(r, "Could not send rtnetlink message: %m");
return r;
}
RTM_NEWROUTE, route->family,
route->protocol);
if (r < 0) {
- log_error_errno(-r, "Could not create RTM_NEWROUTE message: %m");
+ log_error_errno(r, "Could not create RTM_NEWROUTE message: %m");
return r;
}
else if (route->family == AF_INET6)
r = sd_rtnl_message_append_in6_addr(req, RTA_GATEWAY, &route->in_addr.in6);
if (r < 0) {
- log_error_errno(-r, "Could not append RTA_GATEWAY attribute: %m");
+ log_error_errno(r, "Could not append RTA_GATEWAY attribute: %m");
return r;
}
}
else if (route->family == AF_INET6)
r = sd_rtnl_message_append_in6_addr(req, RTA_DST, &route->dst_addr.in6);
if (r < 0) {
- log_error_errno(-r, "Could not append RTA_DST attribute: %m");
+ log_error_errno(r, "Could not append RTA_DST attribute: %m");
return r;
}
r = sd_rtnl_message_route_set_dst_prefixlen(req, route->dst_prefixlen);
if (r < 0) {
- log_error_errno(-r, "Could not set destination prefix length: %m");
+ log_error_errno(r, "Could not set destination prefix length: %m");
return r;
}
}
else if (route->family == AF_INET6)
r = sd_rtnl_message_append_in6_addr(req, RTA_PREFSRC, &route->prefsrc_addr.in6);
if (r < 0) {
- log_error_errno(-r, "Could not append RTA_PREFSRC attribute: %m");
+ log_error_errno(r, "Could not append RTA_PREFSRC attribute: %m");
return r;
}
}
r = sd_rtnl_message_route_set_scope(req, route->scope);
if (r < 0) {
- log_error_errno(-r, "Could not set scope: %m");
+ log_error_errno(r, "Could not set scope: %m");
return r;
}
r = sd_rtnl_message_append_u32(req, RTA_PRIORITY, route->metrics);
if (r < 0) {
- log_error_errno(-r, "Could not append RTA_PRIORITY attribute: %m");
+ log_error_errno(r, "Could not append RTA_PRIORITY attribute: %m");
return r;
}
r = sd_rtnl_message_append_u32(req, RTA_OIF, link->ifindex);
if (r < 0) {
- log_error_errno(-r, "Could not append RTA_OIF attribute: %m");
+ log_error_errno(r, "Could not append RTA_OIF attribute: %m");
return r;
}
r = sd_rtnl_call_async(link->manager->rtnl, req, callback, link, 0, NULL);
if (r < 0) {
- log_error_errno(-r, "Could not send rtnetlink message: %m");
+ log_error_errno(r, "Could not send rtnetlink message: %m");
return r;
}
return 0;
fail:
- log_warning_errno(-r, "Failed to process RTNL link message: %m");
+ log_warning_errno(r, "Failed to process RTNL link message: %m");
return 0;
}
HASHMAP_FOREACH(l, m->links, i) {
r = link_update_monitor(l);
if (r < 0)
- log_warning_errno(-r, "Failed to update monitor information for %i: %m", l->ifindex);
+ log_warning_errno(r, "Failed to update monitor information for %i: %m", l->ifindex);
}
if (manager_all_configured(m))
r = manager_new(&m, arg_interfaces);
if (r < 0) {
- log_error_errno(-r, "Could not create manager: %m");
+ log_error_errno(r, "Could not create manager: %m");
goto finish;
}
r = sd_event_loop(m->event);
if (r < 0) {
- log_error_errno(-r, "Event loop failed: %m");
+ log_error_errno(r, "Event loop failed: %m");
goto finish;
}
r = get_user_creds(&user, &uid, &gid, NULL, NULL);
if (r < 0) {
- log_error_errno(-r, "Cannot resolve user name %s: %m", user);
+ log_error_errno(r, "Cannot resolve user name %s: %m", user);
goto out;
}
r = manager_new(&m);
if (r < 0) {
- log_error_errno(-r, "Could not create manager: %m");
+ log_error_errno(r, "Could not create manager: %m");
goto out;
}
r = manager_udev_listen(m);
if (r < 0) {
- log_error_errno(-r, "Could not connect to udev: %m");
+ log_error_errno(r, "Could not connect to udev: %m");
goto out;
}
r = manager_rtnl_listen(m);
if (r < 0) {
- log_error_errno(-r, "Could not connect to rtnl: %m");
+ log_error_errno(r, "Could not connect to rtnl: %m");
goto out;
}
r = manager_bus_listen(m);
if (r < 0) {
- log_error_errno(-r, "Could not connect to system bus: %m");
+ log_error_errno(r, "Could not connect to system bus: %m");
goto out;
}
r = manager_load_config(m);
if (r < 0) {
- log_error_errno(-r, "Could not load configuration files: %m");
+ log_error_errno(r, "Could not load configuration files: %m");
goto out;
}
r = manager_rtnl_enumerate_links(m);
if (r < 0) {
- log_error_errno(-r, "Could not enumerate links: %m");
+ log_error_errno(r, "Could not enumerate links: %m");
goto out;
}
r = sd_event_loop(m->event);
if (r < 0) {
- log_error_errno(-r, "Event loop failed: %m");
+ log_error_errno(r, "Event loop failed: %m");
goto out;
}
r = sd_pid_notify(arg_pid, false, n);
if (r < 0) {
- log_error_errno(-r, "Failed to notify init system: %m");
+ log_error_errno(r, "Failed to notify init system: %m");
goto finish;
}
t = path_is_mount_point(where, true);
if (t < 0) {
- log_error_errno(-t, "Failed to detect whether %s is a mount point: %m", where);
+ log_error_errno(t, "Failed to detect whether %s is a mount point: %m", where);
if (r == 0)
r = t;
t = mkdir_p(where, 0755);
if (t < 0) {
if (mount_table[k].fatal) {
- log_error_errno(-t, "Failed to create directory %s: %m", where);
+ log_error_errno(t, "Failed to create directory %s: %m", where);
if (r == 0)
r = t;
} else
- log_warning_errno(-t, "Failed to create directory %s: %m", where);
+ log_warning_errno(t, "Failed to create directory %s: %m", where);
continue;
}
} else if (errno == ENOENT) {
r = mkdir_parents_label(where, 0755);
if (r < 0) {
- log_error_errno(-r, "Failed to bind mount %s: %m", *x);
+ log_error_errno(r, "Failed to bind mount %s: %m", *x);
return r;
}
} else {
if (S_ISDIR(source_st.st_mode)) {
r = mkdir_label(where, 0755);
if (r < 0 && errno != EEXIST) {
- log_error_errno(-r, "Failed to create mount point %s: %m", where);
+ log_error_errno(r, "Failed to create mount point %s: %m", where);
return r;
}
} else if (S_ISREG(source_st.st_mode)) {
r = touch(where);
if (r < 0) {
- log_error_errno(-r, "Failed to create mount point %s: %m", where);
+ log_error_errno(r, "Failed to create mount point %s: %m", where);
return r;
}
if (ro) {
r = bind_remount_recursive(where, true);
if (r < 0) {
- log_error_errno(-r, "Read-Only bind mount failed: %m");
+ log_error_errno(r, "Read-Only bind mount failed: %m");
return r;
}
}
r = mkdir_label(where, 0755);
if (r < 0 && errno != EEXIST) {
- log_error_errno(-r, "creating mount point for tmpfs %s failed: %m", where);
+ log_error_errno(r, "creating mount point for tmpfs %s failed: %m", where);
return r;
}
r = mkdir_parents(where, 0755);
if (r < 0) {
- log_error_errno(-r, "Failed to create directory for timezone info %s in container: %m", where);
+ log_error_errno(r, "Failed to create directory for timezone info %s in container: %m", where);
return 0;
}
* fails, it fails, but meh... */
r = mkdir_parents(where, 0755);
if (r < 0) {
- log_warning_errno(-r, "Failed to create parent directory for resolv.conf %s: %m", where);
+ log_warning_errno(r, "Failed to create parent directory for resolv.conf %s: %m", where);
return 0;
}
r = copy_file("/etc/resolv.conf", where, O_TRUNC|O_NOFOLLOW, 0644);
if (r < 0) {
- log_warning_errno(-r, "Failed to copy /etc/resolv.conf to %s: %m", where);
+ log_warning_errno(r, "Failed to copy /etc/resolv.conf to %s: %m", where);
return 0;
}
r = bind_remount_recursive(directory, true);
if (r < 0) {
- log_error_errno(-r, "Failed to remount %s read-only: %m", directory);
+ log_error_errno(r, "Failed to remount %s read-only: %m", directory);
return r;
}
r = bind_remount_recursive(t, true);
if (r < 0) {
- log_error_errno(-r, "Failed to remount %s read-only: %m", t);
+ log_error_errno(r, "Failed to remount %s read-only: %m", t);
goto fail;
}
r = sd_id128_randomize(&rnd);
if (r < 0) {
- log_error_errno(-r, "Failed to generate random boot id: %m");
+ log_error_errno(r, "Failed to generate random boot id: %m");
return r;
}
r = write_string_file(from, as_uuid);
if (r < 0) {
- log_error_errno(-r, "Failed to write boot id: %m");
+ log_error_errno(r, "Failed to write boot id: %m");
return r;
}
} else {
r = mkdir_parents(to, 0775);
if (r < 0) {
- log_error_errno(-r, "Failed to create parent directory of %s: %m", to);
+ log_error_errno(r, "Failed to create parent directory of %s: %m", to);
return -r;
}
r = chmod_and_chown(console, 0600, 0, 0);
if (r < 0) {
- log_error_errno(-r, "Failed to correct access mode for TTY: %m");
+ log_error_errno(r, "Failed to correct access mode for TTY: %m");
return r;
}
r = chmod_and_chown(from, 0600, 0, 0);
if (r < 0) {
- log_error_errno(-r, "Failed to correct access mode for /dev/kmsg: %m");
+ log_error_errno(r, "Failed to correct access mode for /dev/kmsg: %m");
return r;
}
if (r == -ENOENT && arg_link_journal == LINK_AUTO)
return 0;
else if (r < 0) {
- log_error_errno(-r, "Failed to read machine ID from %s: %m", p);
+ log_error_errno(r, "Failed to read machine ID from %s: %m", p);
return r;
}
/* Verify validity */
r = sd_id128_from_string(id, &machine_id);
if (r < 0) {
- log_error_errno(-r, "Failed to parse machine ID from %s: %m", p);
+ log_error_errno(r, "Failed to parse machine ID from %s: %m", p);
return r;
}
r = sd_id128_get_machine(&this_id);
if (r < 0) {
- log_error_errno(-r, "Failed to retrieve machine ID: %m");
+ log_error_errno(r, "Failed to retrieve machine ID: %m");
return r;
}
r = sd_bus_default_system(&bus);
if (r < 0) {
- log_error_errno(-r, "Failed to open system bus: %m");
+ log_error_errno(r, "Failed to open system bus: %m");
return r;
}
"org.freedesktop.machine1.Manager",
"CreateMachineWithNetwork");
if (r < 0) {
- log_error_errno(-r, "Failed to create message: %m");
+ log_error_errno(r, "Failed to create message: %m");
return r;
}
strempty(arg_directory),
local_ifindex > 0 ? 1 : 0, local_ifindex);
if (r < 0) {
- log_error_errno(-r, "Failed to append message arguments: %m");
+ log_error_errno(r, "Failed to append message arguments: %m");
return r;
}
r = sd_bus_message_open_container(m, 'a', "(sv)");
if (r < 0) {
- log_error_errno(-r, "Failed to open container: %m");
+ log_error_errno(r, "Failed to open container: %m");
return r;
}
if (!isempty(arg_slice)) {
r = sd_bus_message_append(m, "(sv)", "Slice", "s", arg_slice);
if (r < 0) {
- log_error_errno(-r, "Failed to append slice: %m");
+ log_error_errno(r, "Failed to append slice: %m");
return r;
}
}
r = sd_bus_message_append(m, "(sv)", "DevicePolicy", "s", "strict");
if (r < 0) {
- log_error_errno(-r, "Failed to add device policy: %m");
+ log_error_errno(r, "Failed to add device policy: %m");
return r;
}
"/dev/pts/ptmx", "rw",
"char-pts", "rw");
if (r < 0) {
- log_error_errno(-r, "Failed to add device whitelist: %m");
+ log_error_errno(r, "Failed to add device whitelist: %m");
return r;
}
r = sd_bus_message_close_container(m);
if (r < 0) {
- log_error_errno(-r, "Failed to close container: %m");
+ log_error_errno(r, "Failed to close container: %m");
return r;
}
r = sd_bus_default_system(&bus);
if (r < 0) {
- log_error_errno(-r, "Failed to open system bus: %m");
+ log_error_errno(r, "Failed to open system bus: %m");
return r;
}
if (r == -ENOENT)
return 0;
if (r < 0) {
- log_error_errno(-r, "Failed to read /proc/self/loginuid: %m");
+ log_error_errno(r, "Failed to read /proc/self/loginuid: %m");
return r;
}
r = sd_rtnl_open(&rtnl, 0);
if (r < 0) {
- log_error_errno(-r, "Failed to connect to netlink: %m");
+ log_error_errno(r, "Failed to connect to netlink: %m");
return r;
}
r = sd_rtnl_message_new_link(rtnl, &m, RTM_NEWLINK, 0);
if (r < 0) {
- log_error_errno(-r, "Failed to allocate netlink message: %m");
+ log_error_errno(r, "Failed to allocate netlink message: %m");
return r;
}
r = sd_rtnl_message_append_string(m, IFLA_IFNAME, iface_name);
if (r < 0) {
- log_error_errno(-r, "Failed to add netlink interface name: %m");
+ log_error_errno(r, "Failed to add netlink interface name: %m");
return r;
}
r = sd_rtnl_message_append_ether_addr(m, IFLA_ADDRESS, &mac_host);
if (r < 0) {
- log_error_errno(-r, "Failed to add netlink MAC address: %m");
+ log_error_errno(r, "Failed to add netlink MAC address: %m");
return r;
}
r = sd_rtnl_message_open_container(m, IFLA_LINKINFO);
if (r < 0) {
- log_error_errno(-r, "Failed to open netlink container: %m");
+ log_error_errno(r, "Failed to open netlink container: %m");
return r;
}
r = sd_rtnl_message_open_container_union(m, IFLA_INFO_DATA, "veth");
if (r < 0) {
- log_error_errno(-r, "Failed to open netlink container: %m");
+ log_error_errno(r, "Failed to open netlink container: %m");
return r;
}
r = sd_rtnl_message_open_container(m, VETH_INFO_PEER);
if (r < 0) {
- log_error_errno(-r, "Failed to open netlink container: %m");
+ log_error_errno(r, "Failed to open netlink container: %m");
return r;
}
r = sd_rtnl_message_append_string(m, IFLA_IFNAME, "host0");
if (r < 0) {
- log_error_errno(-r, "Failed to add netlink interface name: %m");
+ log_error_errno(r, "Failed to add netlink interface name: %m");
return r;
}
r = sd_rtnl_message_append_ether_addr(m, IFLA_ADDRESS, &mac_container);
if (r < 0) {
- log_error_errno(-r, "Failed to add netlink MAC address: %m");
+ log_error_errno(r, "Failed to add netlink MAC address: %m");
return r;
}
r = sd_rtnl_message_append_u32(m, IFLA_NET_NS_PID, pid);
if (r < 0) {
- log_error_errno(-r, "Failed to add netlink namespace field: %m");
+ log_error_errno(r, "Failed to add netlink namespace field: %m");
return r;
}
r = sd_rtnl_message_close_container(m);
if (r < 0) {
- log_error_errno(-r, "Failed to close netlink container: %m");
+ log_error_errno(r, "Failed to close netlink container: %m");
return r;
}
r = sd_rtnl_message_close_container(m);
if (r < 0) {
- log_error_errno(-r, "Failed to close netlink container: %m");
+ log_error_errno(r, "Failed to close netlink container: %m");
return r;
}
r = sd_rtnl_message_close_container(m);
if (r < 0) {
- log_error_errno(-r, "Failed to close netlink container: %m");
+ log_error_errno(r, "Failed to close netlink container: %m");
return r;
}
r = sd_rtnl_call(rtnl, m, 0, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to add new veth interfaces: %m");
+ log_error_errno(r, "Failed to add new veth interfaces: %m");
return r;
}
r = sd_rtnl_open(&rtnl, 0);
if (r < 0) {
- log_error_errno(-r, "Failed to connect to netlink: %m");
+ log_error_errno(r, "Failed to connect to netlink: %m");
return r;
}
r = sd_rtnl_message_new_link(rtnl, &m, RTM_SETLINK, 0);
if (r < 0) {
- log_error_errno(-r, "Failed to allocate netlink message: %m");
+ log_error_errno(r, "Failed to allocate netlink message: %m");
return r;
}
r = sd_rtnl_message_link_set_flags(m, IFF_UP, IFF_UP);
if (r < 0) {
- log_error_errno(-r, "Failed to set IFF_UP flag: %m");
+ log_error_errno(r, "Failed to set IFF_UP flag: %m");
return r;
}
r = sd_rtnl_message_append_string(m, IFLA_IFNAME, veth_name);
if (r < 0) {
- log_error_errno(-r, "Failed to add netlink interface name field: %m");
+ log_error_errno(r, "Failed to add netlink interface name field: %m");
return r;
}
r = sd_rtnl_message_append_u32(m, IFLA_MASTER, bridge);
if (r < 0) {
- log_error_errno(-r, "Failed to add netlink master field: %m");
+ log_error_errno(r, "Failed to add netlink master field: %m");
return r;
}
r = sd_rtnl_call(rtnl, m, 0, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to add veth interface to bridge: %m");
+ log_error_errno(r, "Failed to add veth interface to bridge: %m");
return r;
}
r = sd_rtnl_open(&rtnl, 0);
if (r < 0) {
- log_error_errno(-r, "Failed to connect to netlink: %m");
+ log_error_errno(r, "Failed to connect to netlink: %m");
return r;
}
r = sd_rtnl_message_new_link(rtnl, &m, RTM_SETLINK, ifi);
if (r < 0) {
- log_error_errno(-r, "Failed to allocate netlink message: %m");
+ log_error_errno(r, "Failed to allocate netlink message: %m");
return r;
}
r = sd_rtnl_message_append_u32(m, IFLA_NET_NS_PID, pid);
if (r < 0) {
- log_error_errno(-r, "Failed to append namespace PID to netlink message: %m");
+ log_error_errno(r, "Failed to append namespace PID to netlink message: %m");
return r;
}
r = sd_rtnl_call(rtnl, m, 0, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to move interface %s to namespace: %m", *i);
+ log_error_errno(r, "Failed to move interface %s to namespace: %m", *i);
return r;
}
}
r = sd_rtnl_open(&rtnl, 0);
if (r < 0) {
- log_error_errno(-r, "Failed to connect to netlink: %m");
+ log_error_errno(r, "Failed to connect to netlink: %m");
return r;
}
r = sd_rtnl_message_new_link(rtnl, &m, RTM_NEWLINK, 0);
if (r < 0) {
- log_error_errno(-r, "Failed to allocate netlink message: %m");
+ log_error_errno(r, "Failed to allocate netlink message: %m");
return r;
}
r = sd_rtnl_message_append_u32(m, IFLA_LINK, ifi);
if (r < 0) {
- log_error_errno(-r, "Failed to add netlink interface index: %m");
+ log_error_errno(r, "Failed to add netlink interface index: %m");
return r;
}
r = sd_rtnl_message_append_string(m, IFLA_IFNAME, n);
if (r < 0) {
- log_error_errno(-r, "Failed to add netlink interface name: %m");
+ log_error_errno(r, "Failed to add netlink interface name: %m");
return r;
}
r = sd_rtnl_message_append_u32(m, IFLA_NET_NS_PID, pid);
if (r < 0) {
- log_error_errno(-r, "Failed to add netlink namespace field: %m");
+ log_error_errno(r, "Failed to add netlink namespace field: %m");
return r;
}
r = sd_rtnl_message_open_container(m, IFLA_LINKINFO);
if (r < 0) {
- log_error_errno(-r, "Failed to open netlink container: %m");
+ log_error_errno(r, "Failed to open netlink container: %m");
return r;
}
r = sd_rtnl_message_open_container_union(m, IFLA_INFO_DATA, "macvlan");
if (r < 0) {
- log_error_errno(-r, "Failed to open netlink container: %m");
+ log_error_errno(r, "Failed to open netlink container: %m");
return r;
}
r = sd_rtnl_message_append_u32(m, IFLA_MACVLAN_MODE, MACVLAN_MODE_BRIDGE);
if (r < 0) {
- log_error_errno(-r, "Failed to append macvlan mode: %m");
+ log_error_errno(r, "Failed to append macvlan mode: %m");
return r;
}
r = sd_rtnl_message_close_container(m);
if (r < 0) {
- log_error_errno(-r, "Failed to close netlink container: %m");
+ log_error_errno(r, "Failed to close netlink container: %m");
return r;
}
r = sd_rtnl_message_close_container(m);
if (r < 0) {
- log_error_errno(-r, "Failed to close netlink container: %m");
+ log_error_errno(r, "Failed to close netlink container: %m");
return r;
}
r = sd_rtnl_call(rtnl, m, 0, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to add new macvlan interfaces: %m");
+ log_error_errno(r, "Failed to add new macvlan interfaces: %m");
return r;
}
}
r = seccomp_add_secondary_archs(seccomp);
if (r < 0) {
- log_error_errno(-r, "Failed to add secondary archs to seccomp filter: %m");
+ log_error_errno(r, "Failed to add secondary archs to seccomp filter: %m");
goto finish;
}
if (r == -EFAULT)
continue; /* unknown syscall */
if (r < 0) {
- log_error_errno(-r, "Failed to block syscall: %m");
+ log_error_errno(r, "Failed to block syscall: %m");
goto finish;
}
}
SCMP_A0(SCMP_CMP_EQ, AF_NETLINK),
SCMP_A2(SCMP_CMP_EQ, NETLINK_AUDIT));
if (r < 0) {
- log_error_errno(-r, "Failed to add audit seccomp rule: %m");
+ log_error_errno(r, "Failed to add audit seccomp rule: %m");
goto finish;
}
r = seccomp_attr_set(seccomp, SCMP_FLTATR_CTL_NNP, 0);
if (r < 0) {
- log_error_errno(-r, "Failed to unset NO_NEW_PRIVS: %m");
+ log_error_errno(r, "Failed to unset NO_NEW_PRIVS: %m");
goto finish;
}
r = seccomp_load(seccomp);
if (r < 0)
- log_error_errno(-r, "Failed to install seccomp audit filter: %m");
+ log_error_errno(r, "Failed to install seccomp audit filter: %m");
finish:
seccomp_release(seccomp);
r = udev_enumerate_scan_devices(e);
if (r < 0) {
- log_error_errno(-r, "Failed to scan for partition devices of %s: %m", arg_image);
+ log_error_errno(r, "Failed to scan for partition devices of %s: %m", arg_image);
return r;
}
if (root_device) {
r = mount_device(root_device, arg_directory, NULL, root_device_rw);
if (r < 0) {
- log_error_errno(-r, "Failed to mount root directory: %m");
+ log_error_errno(r, "Failed to mount root directory: %m");
return r;
}
}
if (home_device) {
r = mount_device(home_device, arg_directory, "/home", home_device_rw);
if (r < 0) {
- log_error_errno(-r, "Failed to mount home directory: %m");
+ log_error_errno(r, "Failed to mount home directory: %m");
return r;
}
}
if (srv_device) {
r = mount_device(srv_device, arg_directory, "/srv", srv_device_rw);
if (r < 0) {
- log_error_errno(-r, "Failed to mount server data directory: %m");
+ log_error_errno(r, "Failed to mount server data directory: %m");
return r;
}
}
r = mkdir_parents(home, 0775);
if (r < 0) {
- log_error_errno(-r, "Failed to make home root directory: %m");
+ log_error_errno(r, "Failed to make home root directory: %m");
return r;
}
r = mkdir_safe(home, 0755, uid, gid);
if (r < 0 && r != -EEXIST) {
- log_error_errno(-r, "Failed to make home directory: %m");
+ log_error_errno(r, "Failed to make home directory: %m");
return r;
}
r = wait_for_terminate(pid, &status);
if (r < 0) {
- log_warning_errno(-r, "Failed to wait for container: %m");
+ log_warning_errno(r, "Failed to wait for container: %m");
return r;
}
if (n_fd_passed > 0) {
k = fdset_new_listen_fds(&fds, false);
if (k < 0) {
- log_error_errno(-k, "Failed to collect file descriptors: %m");
+ log_error_errno(k, "Failed to collect file descriptors: %m");
goto finish;
}
}
r = barrier_create(&barrier);
if (r < 0) {
- log_error_errno(-r, "Cannot initialize IPC barrier: %m");
+ log_error_errno(r, "Cannot initialize IPC barrier: %m");
goto finish;
}
k = -EINVAL;
}
- log_error_errno(-k, "Failed to open console: %m");
+ log_error_errno(k, "Failed to open console: %m");
_exit(EXIT_FAILURE);
}
if (arg_read_only) {
k = bind_remount_recursive(arg_directory, true);
if (k < 0) {
- log_error_errno(-k, "Failed to make tree read-only: %m");
+ log_error_errno(k, "Failed to make tree read-only: %m");
_exit(EXIT_FAILURE);
}
}
r = sd_event_new(&event);
if (r < 0) {
- log_error_errno(-r, "Failed to get default event source: %m");
+ log_error_errno(r, "Failed to get default event source: %m");
goto finish;
}
r = pty_forward_new(event, master, &forward);
if (r < 0) {
- log_error_errno(-r, "Failed to create PTY forwarder: %m");
+ log_error_errno(r, "Failed to create PTY forwarder: %m");
goto finish;
}
r = sd_event_loop(event);
if (r < 0) {
- log_error_errno(-r, "Failed to run event loop: %m");
+ log_error_errno(r, "Failed to run event loop: %m");
return r;
}
if (q == -ENXIO)
continue;
if (q < 0) {
- log_error_errno(-r, "Failed to query %s: %m", path_table[i]);
+ log_error_errno(r, "Failed to query %s: %m", path_table[i]);
r = q;
continue;
}
r = sd_path_home(i, arg_suffix, &p);
if (r < 0) {
- log_error_errno(-r, "Failed to query %s: %m", n);
+ log_error_errno(r, "Failed to query %s: %m", n);
return r;
}
r = parse_proc_cmdline(parse_proc_cmdline_item);
if (r < 0)
- log_warning_errno(-r, "Failed to parse kernel command line, ignoring: %m");
+ log_warning_errno(r, "Failed to parse kernel command line, ignoring: %m");
test_files();
r = mkdir_parents_label(RANDOM_SEED, 0755);
if (r < 0) {
- log_error_errno(-r, "Failed to create directory " RANDOM_SEED_DIR ": %m");
+ log_error_errno(r, "Failed to create directory " RANDOM_SEED_DIR ": %m");
goto finish;
}
k = hashmap_put(pids, UINT_TO_PTR(pid), s);
if (k < 0) {
- log_error_errno(-k, "Failed to add PID to set: %m");
+ log_error_errno(k, "Failed to add PID to set: %m");
ret = EXIT_FAILURE;
continue;
}
r = in_addr_to_string(family, a, &pretty);
if (r < 0) {
- log_error_errno(-r, "%s: failed to print address: %m", name);
+ log_error_errno(r, "%s: failed to print address: %m", name);
continue;
}
r = sd_bus_open_system(&bus);
if (r < 0) {
- log_error_errno(-r, "sd_bus_open_system: %m");
+ log_error_errno(r, "sd_bus_open_system: %m");
goto finish;
}
finish:
if (r < 0) {
- log_error_errno(-r, "Failed to send hostname reply: %m");
+ log_error_errno(r, "Failed to send hostname reply: %m");
sd_bus_reply_method_errno(q->request, -r, NULL);
}
finish:
if (r < 0) {
- log_error_errno(-r, "Failed to send address reply: %m");
+ log_error_errno(r, "Failed to send address reply: %m");
sd_bus_reply_method_errno(q->request, -r, NULL);
}
finish:
if (r < 0) {
- log_error_errno(-r, "Failed to send record reply: %m");
+ log_error_errno(r, "Failed to send record reply: %m");
sd_bus_reply_method_errno(q->request, -r, NULL);
}
r = sd_bus_message_read(message, "b", &b);
if (r < 0) {
- log_debug_errno(-r, "Failed to parse PrepareForSleep signal: %m");
+ log_debug_errno(r, "Failed to parse PrepareForSleep signal: %m");
return 0;
}
* boot. Let's try in 5s again. As soon as we have
* kdbus we can stop doing this... */
- log_debug_errno(-r, "Failed to connect to bus, trying again in 5s: %m");
+ log_debug_errno(r, "Failed to connect to bus, trying again in 5s: %m");
r = sd_event_add_time(m->event, &m->bus_retry_event_source, CLOCK_MONOTONIC, now(CLOCK_MONOTONIC) + 5*USEC_PER_SEC, 0, on_bus_retry, m);
if (r < 0) {
- log_error_errno(-r, "Failed to install bus reconnect time event: %m");
+ log_error_errno(r, "Failed to install bus reconnect time event: %m");
return r;
}
r = sd_bus_add_object_vtable(m->bus, NULL, "/org/freedesktop/resolve1", "org.freedesktop.resolve1.Manager", resolve_vtable, m);
if (r < 0) {
- log_error_errno(-r, "Failed to register object: %m");
+ log_error_errno(r, "Failed to register object: %m");
return r;
}
r = sd_bus_request_name(m->bus, "org.freedesktop.resolve1", 0);
if (r < 0) {
- log_error_errno(-r, "Failed to register name: %m");
+ log_error_errno(r, "Failed to register name: %m");
return r;
}
r = sd_bus_attach_event(m->bus, m->event, 0);
if (r < 0) {
- log_error_errno(-r, "Failed to attach bus to event loop: %m");
+ log_error_errno(r, "Failed to attach bus to event loop: %m");
return r;
}
match_prepare_for_sleep,
m);
if (r < 0)
- log_error_errno(-r, "Failed to add match for PrepareForSleep: %m");
+ log_error_errno(r, "Failed to add match for PrepareForSleep: %m");
return 0;
}
r = dns_packet_extract(p);
if (r < 0) {
- log_debug_errno(-r, "Failed to extract resources from incoming packet: %m");
+ log_debug_errno(r, "Failed to extract resources from incoming packet: %m");
return;
}
r = dns_zone_lookup(&s->zone, p->question, &answer, &soa, &tentative);
if (r < 0) {
- log_debug_errno(-r, "Failed to lookup key: %m");
+ log_debug_errno(r, "Failed to lookup key: %m");
return;
}
if (r == 0)
r = dns_scope_make_reply_packet(s, DNS_PACKET_ID(p), DNS_RCODE_SUCCESS, p->question, answer, soa, tentative, &reply);
if (r < 0) {
- log_debug_errno(-r, "Failed to build reply packet: %m");
+ log_debug_errno(r, "Failed to build reply packet: %m");
return;
}
return;
}
if (fd < 0) {
- log_debug_errno(-fd, "Failed to get reply socket: %m");
+ log_debug_errno(fd, "Failed to get reply socket: %m");
return;
}
}
if (r < 0) {
- log_debug_errno(-r, "Failed to send reply packet: %m");
+ log_debug_errno(r, "Failed to send reply packet: %m");
return;
}
}
r = dns_scope_make_conflict_packet(scope, rr, &p);
if (r < 0) {
- log_error_errno(-r, "Failed to make conflict packet: %m");
+ log_error_errno(r, "Failed to make conflict packet: %m");
return 0;
}
r = dns_scope_emit(scope, p);
if (r < 0)
- log_debug_errno(-r, "Failed to send conflict packet: %m");
+ log_debug_errno(r, "Failed to send conflict packet: %m");
}
return 0;
if (r == -EEXIST || r == 0)
return 0;
if (r < 0) {
- log_debug_errno(-r, "Failed to queue conflicting RR: %m");
+ log_debug_errno(r, "Failed to queue conflicting RR: %m");
return r;
}
LLMNR_JITTER_INTERVAL_USEC,
on_conflict_dispatch, scope);
if (r < 0) {
- log_debug_errno(-r, "Failed to add conflict dispatch event: %m");
+ log_debug_errno(r, "Failed to add conflict dispatch event: %m");
return r;
}
r = dns_packet_extract(p);
if (r < 0) {
- log_debug_errno(-r, "Failed to extract packet: %m");
+ log_debug_errno(r, "Failed to extract packet: %m");
return;
}
i->state = DNS_ZONE_ITEM_VERIFYING;
r = dns_zone_item_probe_start(i);
if (r < 0) {
- log_error_errno(-r, "Failed to start probing for verifying RR: %m");
+ log_error_errno(r, "Failed to start probing for verifying RR: %m");
i->state = DNS_ZONE_ITEM_ESTABLISHED;
return r;
}
if (!l->unicast_scope) {
r = dns_scope_new(l->manager, &l->unicast_scope, l, DNS_PROTOCOL_DNS, AF_UNSPEC);
if (r < 0)
- log_warning_errno(-r, "Failed to allocate DNS scope: %m");
+ log_warning_errno(r, "Failed to allocate DNS scope: %m");
}
} else
l->unicast_scope = dns_scope_free(l->unicast_scope);
if (!l->llmnr_ipv4_scope) {
r = dns_scope_new(l->manager, &l->llmnr_ipv4_scope, l, DNS_PROTOCOL_LLMNR, AF_INET);
if (r < 0)
- log_warning_errno(-r, "Failed to allocate LLMNR IPv4 scope: %m");
+ log_warning_errno(r, "Failed to allocate LLMNR IPv4 scope: %m");
}
} else
l->llmnr_ipv4_scope = dns_scope_free(l->llmnr_ipv4_scope);
if (!l->llmnr_ipv6_scope) {
r = dns_scope_new(l->manager, &l->llmnr_ipv6_scope, l, DNS_PROTOCOL_LLMNR, AF_INET6);
if (r < 0)
- log_warning_errno(-r, "Failed to allocate LLMNR IPv6 scope: %m");
+ log_warning_errno(r, "Failed to allocate LLMNR IPv6 scope: %m");
}
} else
l->llmnr_ipv6_scope = dns_scope_free(l->llmnr_ipv6_scope);
r = dns_zone_put(&a->link->llmnr_ipv4_scope->zone, a->link->llmnr_ipv4_scope, a->llmnr_address_rr, true);
if (r < 0)
- log_warning_errno(-r, "Failed to add A record to LLMNR zone: %m");
+ log_warning_errno(r, "Failed to add A record to LLMNR zone: %m");
r = dns_zone_put(&a->link->llmnr_ipv4_scope->zone, a->link->llmnr_ipv4_scope, a->llmnr_ptr_rr, false);
if (r < 0)
- log_warning_errno(-r, "Failed to add IPv6 PTR record to LLMNR zone: %m");
+ log_warning_errno(r, "Failed to add IPv6 PTR record to LLMNR zone: %m");
} else {
if (a->llmnr_address_rr) {
if (a->link->llmnr_ipv4_scope)
r = dns_zone_put(&a->link->llmnr_ipv6_scope->zone, a->link->llmnr_ipv6_scope, a->llmnr_address_rr, true);
if (r < 0)
- log_warning_errno(-r, "Failed to add AAAA record to LLMNR zone: %m");
+ log_warning_errno(r, "Failed to add AAAA record to LLMNR zone: %m");
r = dns_zone_put(&a->link->llmnr_ipv6_scope->zone, a->link->llmnr_ipv6_scope, a->llmnr_ptr_rr, false);
if (r < 0)
- log_warning_errno(-r, "Failed to add IPv6 PTR record to LLMNR zone: %m");
+ log_warning_errno(r, "Failed to add IPv6 PTR record to LLMNR zone: %m");
} else {
if (a->llmnr_address_rr) {
if (a->link->llmnr_ipv6_scope)
return;
fail:
- log_debug_errno(-r, "Failed to update address RRs: %m");
+ log_debug_errno(r, "Failed to update address RRs: %m");
}
int link_address_update_rtnl(LinkAddress *a, sd_rtnl_message *m) {
return 0;
fail:
- log_warning_errno(-r, "Failed to process RTNL link message: %m");
+ log_warning_errno(r, "Failed to process RTNL link message: %m");
return 0;
}
return 0;
fail:
- log_warning_errno(-r, "Failed to process RTNL address message: %m");
+ log_warning_errno(r, "Failed to process RTNL address message: %m");
return 0;
}
HASHMAP_FOREACH(l, m->links, i) {
r = link_update_monitor(l);
if (r < 0)
- log_warning_errno(-r, "Failed to update monitor information for %i: %m", l->ifindex);
+ log_warning_errno(r, "Failed to update monitor information for %i: %m", l->ifindex);
}
r = manager_write_resolv_conf(m);
if (r < 0)
- log_warning_errno(-r, "Could not update resolv.conf: %m");
+ log_warning_errno(r, "Could not update resolv.conf: %m");
return 0;
}
/* kernels prior to 3.2 don't support polling this file. Ignore the failure. */
m->hostname_fd = safe_close(m->hostname_fd);
else {
- log_error_errno(-r, "Failed to add hostname event source: %m");
+ log_error_errno(r, "Failed to add hostname event source: %m");
return r;
}
}
r = in_addr_to_string(s->family, &s->address, &t);
if (r < 0) {
- log_warning_errno(-r, "Invalid DNS address. Ignoring: %m");
+ log_warning_errno(r, "Invalid DNS address. Ignoring: %m");
return;
}
r = mac_selinux_init(NULL);
if (r < 0) {
- log_error_errno(-r, "SELinux setup failed: %m");
+ log_error_errno(r, "SELinux setup failed: %m");
goto finish;
}
r = get_user_creds(&user, &uid, &gid, NULL, NULL);
if (r < 0) {
- log_error_errno(-r, "Cannot resolve user name %s: %m", user);
+ log_error_errno(r, "Cannot resolve user name %s: %m", user);
goto finish;
}
/* Always create the directory where resolv.conf will live */
r = mkdir_safe_label("/run/systemd/resolve", 0755, uid, gid);
if (r < 0) {
- log_error_errno(-r, "Could not create runtime directory: %m");
+ log_error_errno(r, "Could not create runtime directory: %m");
goto finish;
}
r = manager_new(&m);
if (r < 0) {
- log_error_errno(-r, "Could not create manager: %m");
+ log_error_errno(r, "Could not create manager: %m");
goto finish;
}
r = manager_parse_config_file(m);
if (r < 0)
- log_warning_errno(-r, "Failed to parse configuration file: %m");
+ log_warning_errno(r, "Failed to parse configuration file: %m");
r = manager_start(m);
if (r < 0) {
- log_error_errno(-r, "Failed to start manager: %m");
+ log_error_errno(r, "Failed to start manager: %m");
goto finish;
}
* symlink */
r = manager_write_resolv_conf(m);
if (r < 0)
- log_warning_errno(-r, "Could not create resolv.conf: %m");
+ log_warning_errno(r, "Could not create resolv.conf: %m");
sd_notify(false,
"READY=1\n"
r = sd_event_loop(m->event);
if (r < 0) {
- log_error_errno(-r, "Event loop failed: %m");
+ log_error_errno(r, "Event loop failed: %m");
goto finish;
}
r = mkdir_p("/var/lib/systemd/rfkill", 0755);
if (r < 0) {
- log_error_errno(-r, "Failed to create rfkill directory: %m");
+ log_error_errno(r, "Failed to create rfkill directory: %m");
return EXIT_FAILURE;
}
if (r == -ENOENT)
return EXIT_SUCCESS;
- log_error_errno(-r, "Failed to read %s: %m", saved);
+ log_error_errno(r, "Failed to read %s: %m", saved);
return EXIT_FAILURE;
}
r = udev_device_set_sysattr_value(device, "soft", value);
if (r < 0) {
- log_error_errno(-r, "Failed to write system attribute: %m");
+ log_error_errno(r, "Failed to write system attribute: %m");
return EXIT_FAILURE;
}
value = udev_device_get_sysattr_value(device, "soft");
if (!value) {
- log_error_errno(-r, "Failed to read system attribute: %m");
+ log_error_errno(r, "Failed to read system attribute: %m");
return EXIT_FAILURE;
}
r = write_string_file(saved, value);
if (r < 0) {
- log_error_errno(-r, "Failed to write %s: %m", saved);
+ log_error_errno(r, "Failed to write %s: %m", saved);
return EXIT_FAILURE;
}
r = get_group_creds(&arg_exec_group, &gid);
if (r < 0) {
- log_error_errno(-r, "Failed to resolve group %s: %m", arg_exec_group);
+ log_error_errno(r, "Failed to resolve group %s: %m", arg_exec_group);
return r;
}
r = get_user_creds(&arg_exec_user, &uid, &gid, &home, &shell);
if (r < 0) {
- log_error_errno(-r, "Failed to resolve user %s: %m", arg_exec_user);
+ log_error_errno(r, "Failed to resolve user %s: %m", arg_exec_user);
return r;
}
r = bus_open_transport_systemd(arg_transport, arg_host, arg_user, &bus);
if (r < 0) {
- log_error_errno(-r, "Failed to create bus connection: %m");
+ log_error_errno(r, "Failed to create bus connection: %m");
goto finish;
}
r = capability_bounding_set_drop(~keep_capabilities, true);
if (r < 0) {
- log_error_errno(-r, "Failed to drop capabilities: %m");
+ log_error_errno(r, "Failed to drop capabilities: %m");
return r;
}
r = fsck_exists(fstype);
if (r == -ENOENT) {
/* treat missing check as essentially OK */
- log_debug_errno(-r, "Checking was requested for %s, but fsck.%s does not exist: %m", what, fstype);
+ log_debug_errno(r, "Checking was requested for %s, but fsck.%s does not exist: %m", what, fstype);
return 0;
} else if (r < 0) {
- log_warning_errno(-r, "Checking was requested for %s, but fsck.%s cannot be used: %m", what, fstype);
+ log_warning_errno(r, "Checking was requested for %s, but fsck.%s cannot be used: %m", what, fstype);
return r;
}
}
state = unit_file_get_state(scope, root_dir, *i);
if (state < 0) {
- log_error_errno(-state, "Failed to get unit file state for %s: %m", *i);
+ log_error_errno(state, "Failed to get unit file state for %s: %m", *i);
return state;
}
r = sd_journal_get_monotonic_usec(j, &t, &boot_id);
if (r < 0) {
- log_error_errno(-r, "Failed to get monotonic timestamp: %m");
+ log_error_errno(r, "Failed to get monotonic timestamp: %m");
return r;
}
r = sd_journal_get_realtime_usec(j, &x);
if (r < 0) {
- log_error_errno(-r, "Failed to get realtime timestamp: %m");
+ log_error_errno(r, "Failed to get realtime timestamp: %m");
return r;
}
r = parse_field(data, length, "_SOURCE_REALTIME_TIMESTAMP=", &value, &size);
if (r < 0)
- log_debug_errno(-r, "_SOURCE_REALTIME_TIMESTAMP invalid: %m");
+ log_debug_errno(r, "_SOURCE_REALTIME_TIMESTAMP invalid: %m");
else {
r = safe_atou64(value, &realtime);
if (r < 0)
r = sd_journal_get_cursor(j, &cursor);
if (r < 0) {
- log_error_errno(-r, "Failed to get cursor: %m");
+ log_error_errno(r, "Failed to get cursor: %m");
return r;
}
r = sd_journal_get_realtime_usec(j, &realtime);
if (r < 0) {
- log_error_errno(-r, "Failed to get realtime timestamp: %m");
+ log_error_errno(r, "Failed to get realtime timestamp: %m");
return r;
}
r = sd_journal_get_monotonic_usec(j, &monotonic, &boot_id);
if (r < 0) {
- log_error_errno(-r, "Failed to get monotonic timestamp: %m");
+ log_error_errno(r, "Failed to get monotonic timestamp: %m");
return r;
}
r = sd_journal_get_cursor(j, &cursor);
if (r < 0) {
- log_error_errno(-r, "Failed to get cursor: %m");
+ log_error_errno(r, "Failed to get cursor: %m");
return r;
}
r = sd_journal_get_realtime_usec(j, &realtime);
if (r < 0) {
- log_error_errno(-r, "Failed to get realtime timestamp: %m");
+ log_error_errno(r, "Failed to get realtime timestamp: %m");
return r;
}
r = sd_journal_get_monotonic_usec(j, &monotonic, &boot_id);
if (r < 0) {
- log_error_errno(-r, "Failed to get monotonic timestamp: %m");
+ log_error_errno(r, "Failed to get monotonic timestamp: %m");
return r;
}
r = sd_journal_get_cursor(j, &cursor);
if (r < 0) {
- log_error_errno(-r, "Failed to get cursor: %m");
+ log_error_errno(r, "Failed to get cursor: %m");
return r;
}
if (r == -ENOENT)
return 0;
- log_error_errno(-r, "Failed to get data: %m");
+ log_error_errno(r, "Failed to get data: %m");
return r;
}
if (machine) {
r = get_boot_id_for_machine(machine, &boot_id);
if (r < 0) {
- log_error_errno(-r, "Failed to get boot id of container %s: %m", machine);
+ log_error_errno(r, "Failed to get boot id of container %s: %m", machine);
return r;
}
} else {
r = sd_id128_get_boot(&boot_id);
if (r < 0) {
- log_error_errno(-r, "Failed to get boot id: %m");
+ log_error_errno(r, "Failed to get boot id: %m");
return r;
}
}
sd_id128_to_string(boot_id, match + 9);
r = sd_journal_add_match(j, match, strlen(match));
if (r < 0) {
- log_error_errno(-r, "Failed to add match: %m");
+ log_error_errno(r, "Failed to add match: %m");
return r;
}
if (null_stdio) {
r = make_null_stdio();
if (r < 0) {
- log_error_errno(-r, "Failed to kill stdio: %m");
+ log_error_errno(r, "Failed to kill stdio: %m");
_exit(EXIT_FAILURE);
}
}
r = get_status_field("/proc/meminfo", "\nActive(anon):", &active);
if (r < 0) {
- log_error_errno(-r, "Failed to retrieve Active(anon) from /proc/meminfo: %m");
+ log_error_errno(r, "Failed to retrieve Active(anon) from /proc/meminfo: %m");
return false;
}
r = socket_address_print(&a, &p);
if (r < 0) {
- log_error_errno(-r, "socket_address_print(): %m");
+ log_error_errno(r, "socket_address_print(): %m");
return r;
}
if (fd < 0)
- log_error_errno(-fd, "Failed to listen on %s: %m", p);
+ log_error_errno(fd, "Failed to listen on %s: %m", p);
else
log_full(log_level, "Listening on %s", p);
}
r = sockaddr_pretty(&sa->sa, salen, true, &ret);
if (r < 0) {
- log_error_errno(-r, "sockadd_pretty() failed: %m");
+ log_error_errno(r, "sockadd_pretty() failed: %m");
return r;
}
SYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH,
SYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH, "--watch", NULL);
if (r < 0)
- log_error_errno(-r, "Failed to fork TTY ask password agent: %m");
+ log_error_errno(r, "Failed to fork TTY ask password agent: %m");
return r;
}
safe_close(pipe_fd[1]);
if (r < 0)
- log_error_errno(-r, "Failed to fork TTY ask password agent: %m");
+ log_error_errno(r, "Failed to fork TTY ask password agent: %m");
else
/* Wait until the agent closes the fd */
fd_wait_for_event(pipe_fd[0], POLLHUP, USEC_INFINITY);
r = reset_terminal_fd(fd, true);
if (r < 0)
- log_warning_errno(-r, "Failed to reset terminal: %m");
+ log_warning_errno(r, "Failed to reset terminal: %m");
return fd;
r = wait_for_terminate(pid, &status);
if (r < 0) {
- log_warning_errno(-r, "Failed to wait for %s: %m", name);
+ log_warning_errno(r, "Failed to wait for %s: %m", name);
return r;
}
fd = acquire_terminal("/dev/console", false, true, true, USEC_INFINITY);
if (fd < 0) {
- log_error_errno(-fd, "Failed to acquire terminal: %m");
+ log_error_errno(fd, "Failed to acquire terminal: %m");
return fd;
}
r = make_stdio(fd);
if (r < 0) {
- log_error_errno(-r, "Failed to duplicate terminal fd: %m");
+ log_error_errno(r, "Failed to duplicate terminal fd: %m");
return r;
}
r = mkdir_safe_label("/run/systemd/shutdown", 0755, 0, 0);
if (r < 0) {
- log_error_errno(-r, "Failed to create shutdown subdirectory: %m");
+ log_error_errno(r, "Failed to create shutdown subdirectory: %m");
return r;
}
r = fopen_temporary("/run/systemd/shutdown/scheduled", &f, &temp_path);
if (r < 0) {
- log_error_errno(-r, "Failed to save information about scheduled shutdowns: %m");
+ log_error_errno(r, "Failed to save information about scheduled shutdowns: %m");
return r;
}
n_fds = sd_listen_fds(true);
if (n_fds < 0) {
- log_error_errno(-r, "Failed to read listening file descriptors from environment: %m");
+ log_error_errno(r, "Failed to read listening file descriptors from environment: %m");
return EXIT_FAILURE;
}
e = write_string_file_atomic("/run/nologin", "System is going down.");
if (e < 0)
- log_error_errno(-e, "Failed to create /run/nologin: %m");
+ log_error_errno(e, "Failed to create /run/nologin: %m");
else
unlink_nologin = true;
r = 0;
if (r < 0) {
- log_error_errno(-r, "Failed to set up server event source: %m");
+ log_error_errno(r, "Failed to set up server event source: %m");
return r;
}
r = 0;
if (r < 0) {
- log_error_errno(-r, "Failed to set up client event source: %m");
+ log_error_errno(r, "Failed to set up client event source: %m");
return r;
}
if (errno == EINPROGRESS) {
r = sd_event_add_io(c->context->event, &c->client_event_source, c->client_fd, EPOLLOUT, connect_cb, c);
if (r < 0) {
- log_error_errno(-r, "Failed to add connection socket: %m");
+ log_error_errno(r, "Failed to add connection socket: %m");
goto fail;
}
r = sd_event_source_set_enabled(c->client_event_source, SD_EVENT_ONESHOT);
if (r < 0) {
- log_error_errno(-r, "Failed to enable oneshot event source: %m");
+ log_error_errno(r, "Failed to enable oneshot event source: %m");
goto fail;
}
} else {
log_debug("Looking up address info for %s:%s", node, service);
r = sd_resolve_getaddrinfo(c->context->resolve, &c->resolve_query, node, service, &hints, resolve_cb, c);
if (r < 0) {
- log_error_errno(-r, "Failed to resolve remote host: %m");
+ log_error_errno(r, "Failed to resolve remote host: %m");
goto fail;
}
r = add_connection_socket(context, nfd);
if (r < 0) {
- log_error_errno(-r, "Failed to accept connection, ignoring: %m");
+ log_error_errno(r, "Failed to accept connection, ignoring: %m");
safe_close(fd);
}
}
r = sd_event_source_set_enabled(s, SD_EVENT_ONESHOT);
if (r < 0) {
- log_error_errno(-r, "Error while re-enabling listener with ONESHOT: %m");
+ log_error_errno(r, "Error while re-enabling listener with ONESHOT: %m");
sd_event_exit(context->event, r);
return r;
}
r = sd_is_socket(fd, 0, SOCK_STREAM, 1);
if (r < 0) {
- log_error_errno(-r, "Failed to determine socket type: %m");
+ log_error_errno(r, "Failed to determine socket type: %m");
return r;
}
if (r == 0) {
r = fd_nonblock(fd, true);
if (r < 0) {
- log_error_errno(-r, "Failed to mark file descriptor non-blocking: %m");
+ log_error_errno(r, "Failed to mark file descriptor non-blocking: %m");
return r;
}
r = sd_event_add_io(context->event, &source, fd, EPOLLIN, accept_cb, context);
if (r < 0) {
- log_error_errno(-r, "Failed to add event source: %m");
+ log_error_errno(r, "Failed to add event source: %m");
return r;
}
r = set_put(context->listen, source);
if (r < 0) {
- log_error_errno(-r, "Failed to add source to set: %m");
+ log_error_errno(r, "Failed to add source to set: %m");
sd_event_source_unref(source);
return r;
}
* watching to accept(). */
r = sd_event_source_set_enabled(source, SD_EVENT_ONESHOT);
if (r < 0) {
- log_error_errno(-r, "Failed to enable oneshot mode: %m");
+ log_error_errno(r, "Failed to enable oneshot mode: %m");
return r;
}
r = sd_event_default(&context.event);
if (r < 0) {
- log_error_errno(-r, "Failed to allocate event loop: %m");
+ log_error_errno(r, "Failed to allocate event loop: %m");
goto finish;
}
r = sd_resolve_default(&context.resolve);
if (r < 0) {
- log_error_errno(-r, "Failed to allocate resolver: %m");
+ log_error_errno(r, "Failed to allocate resolver: %m");
goto finish;
}
r = sd_resolve_attach_event(context.resolve, context.event, 0);
if (r < 0) {
- log_error_errno(-r, "Failed to attach resolver: %m");
+ log_error_errno(r, "Failed to attach resolver: %m");
goto finish;
}
r = sd_event_loop(context.event);
if (r < 0) {
- log_error_errno(-r, "Failed to run event loop: %m");
+ log_error_errno(r, "Failed to run event loop: %m");
goto finish;
}
if (ignore_enoent && r == -ENOENT)
return 0;
- log_error_errno(-r, "Failed to open file '%s', ignoring: %m", path);
+ log_error_errno(r, "Failed to open file '%s', ignoring: %m", path);
return r;
}
k = hashmap_put(sysctl_options, property, new_value);
if (k < 0) {
- log_error_errno(-k, "Failed to add sysctl variable %s to hashmap: %m", property);
+ log_error_errno(k, "Failed to add sysctl variable %s to hashmap: %m", property);
free(property);
free(new_value);
return k;
r = conf_files_list_nulstr(&files, ".conf", NULL, conf_file_dirs);
if (r < 0) {
- log_error_errno(-r, "Failed to enumerate sysctl.d files: %m");
+ log_error_errno(r, "Failed to enumerate sysctl.d files: %m");
goto finish;
}
r = sd_bus_open_system_container(&container, *i);
if (r < 0) {
- log_error_errno(-r, "Failed to connect to container %s: %m", *i);
+ log_error_errno(r, "Failed to connect to container %s: %m", *i);
continue;
}
r = unit_file_get_list(arg_scope, arg_root, h);
if (r < 0) {
unit_file_list_free(h);
- log_error_errno(-r, "Failed to get unit file list: %m");
+ log_error_errno(r, "Failed to get unit file list: %m");
return r;
}
if (!bus || avoid_bus()) {
r = unit_file_get_default(arg_scope, arg_root, &_path);
if (r < 0) {
- log_error_errno(-r, "Failed to get default target: %m");
+ log_error_errno(r, "Failed to get default target: %m");
return r;
}
path = _path;
if (!bus || avoid_bus()) {
r = unit_file_set_default(arg_scope, arg_root, unit, true, &changes, &n_changes);
if (r < 0) {
- log_error_errno(-r, "Failed to set default target: %m");
+ log_error_errno(r, "Failed to set default target: %m");
return r;
}
q = safe_atou32(*name, &id);
if (q < 0) {
- log_error_errno(-q, "Failed to parse job id \"%s\": %m", *name);
+ log_error_errno(q, "Failed to parse job id \"%s\": %m", *name);
return q;
}
while (!set_isempty(s)) {
q = bus_process_wait(bus);
if (q < 0) {
- log_error_errno(-q, "Failed to wait for response: %m");
+ log_error_errno(q, "Failed to wait for response: %m");
return q;
}
STRV_FOREACH(i, triggered_by) {
r = check_one_unit(bus, *i, "active\0reloading\0", true);
if (r < 0) {
- log_error_errno(-r, "Failed to check unit: %m");
+ log_error_errno(r, "Failed to check unit: %m");
return r;
}
else {
r = expand_names(bus, args + 1, suffix, &names);
if (r < 0)
- log_error_errno(-r, "Failed to expand names: %m");
+ log_error_errno(r, "Failed to expand names: %m");
}
if (!arg_no_block) {
r = enable_wait_for_jobs(bus);
if (r < 0) {
- log_error_errno(-r, "Could not watch jobs: %m");
+ log_error_errno(r, "Could not watch jobs: %m");
return r;
}
r = expand_names(bus, args, NULL, &names);
if (r < 0) {
- log_error_errno(-r, "Failed to expand names: %m");
+ log_error_errno(r, "Failed to expand names: %m");
return r;
}
r = expand_names(bus, args + 1, NULL, &names);
if (r < 0)
- log_error_errno(-r, "Failed to expand names: %m");
+ log_error_errno(r, "Failed to expand names: %m");
STRV_FOREACH(name, names) {
_cleanup_bus_message_unref_ sd_bus_message *m = NULL;
r = bus_map_all_properties(bus, "org.freedesktop.systemd1", "/org/freedesktop/systemd1", machine_info_property_map, &mi);
if (r < 0) {
- log_error_errno(-r, "Failed to read server status: %m");
+ log_error_errno(r, "Failed to read server status: %m");
return r;
}
r = expand_names(bus, patterns, NULL, &names);
if (r < 0)
- log_error_errno(-r, "Failed to expand names: %m");
+ log_error_errno(r, "Failed to expand names: %m");
STRV_FOREACH(name, names) {
_cleanup_free_ char *unit;
r = expand_names(bus, args + 1, NULL, &names);
if (r < 0)
- log_error_errno(-r, "Failed to expand names: %m");
+ log_error_errno(r, "Failed to expand names: %m");
pager_open_if_enabled();
r = copy_file_fd(fragment_path, STDOUT_FILENO);
if (r < 0) {
- log_warning_errno(-r, "Failed to cat %s: %m", fragment_path);
+ log_warning_errno(r, "Failed to cat %s: %m", fragment_path);
continue;
}
}
r = copy_file_fd(*path, STDOUT_FILENO);
if (r < 0) {
- log_warning_errno(-r, "Failed to cat %s: %m", *path);
+ log_warning_errno(r, "Failed to cat %s: %m", *path);
continue;
}
}
r = expand_names(bus, args + 1, ".snapshot", &names);
if (r < 0)
- log_error_errno(-r, "Failed to expand names: %m");
+ log_error_errno(r, "Failed to expand names: %m");
STRV_FOREACH(name, names) {
_cleanup_bus_message_unref_ sd_bus_message *m = NULL;
r = expand_names(bus, args + 1, NULL, &names);
if (r < 0)
- log_error_errno(-r, "Failed to expand names: %m");
+ log_error_errno(r, "Failed to expand names: %m");
STRV_FOREACH(name, names) {
_cleanup_bus_message_unref_ sd_bus_message *m = NULL;
"init", &cmdline_init,
NULL);
if (r < 0)
- log_debug_errno(-r, "Failed to parse /proc/cmdline: %m");
+ log_debug_errno(r, "Failed to parse /proc/cmdline: %m");
init = cmdline_init;
}
j = wait_for_terminate(pid, &status);
if (j < 0) {
- log_error_errno(-r, "Failed to wait for child: %m");
+ log_error_errno(r, "Failed to wait for child: %m");
return j;
}
assert_not_reached("Unknown verb");
if (r < 0) {
- log_error_errno(-r, "Operation failed: %m");
+ log_error_errno(r, "Operation failed: %m");
goto finish;
}
r = unit_file_add_dependency(arg_scope, arg_runtime, arg_root, names, target, dep, arg_force, &changes, &n_changes);
if (r < 0) {
- log_error_errno(-r, "Can't add dependency: %m");
+ log_error_errno(r, "Can't add dependency: %m");
return r;
}
r = unit_file_preset_all(arg_scope, arg_runtime, arg_root, arg_preset_mode, arg_force, &changes, &n_changes);
if (r < 0) {
- log_error_errno(-r, "Operation failed: %m");
+ log_error_errno(r, "Operation failed: %m");
goto finish;
}
state = unit_file_get_state(arg_scope, arg_root, *name);
if (state < 0) {
- log_error_errno(-state, "Failed to get unit file state for %s: %m", *name);
+ log_error_errno(state, "Failed to get unit file state for %s: %m", *name);
return state;
}
* enable/disable */
if (verb->bus == NOBUS) {
if (!bus && !avoid_bus()) {
- log_error_errno(-bus_error, "Failed to get D-Bus connection: %m");
+ log_error_errno(bus_error, "Failed to get D-Bus connection: %m");
return -EIO;
}
}
if ((verb->bus != FORCE || arg_force <= 0) && !bus) {
- log_error_errno(-bus_error, "Failed to get D-Bus connection: %m");
+ log_error_errno(bus_error, "Failed to get D-Bus connection: %m");
return -EIO;
}
}
m);
if (r < 0)
- log_warning_errno(-r, "Failed to talk to shutdownd, proceeding with immediate shutdown: %m");
+ log_warning_errno(r, "Failed to talk to shutdownd, proceeding with immediate shutdown: %m");
else {
char date[FORMAT_TIMESTAMP_MAX];
else {
r = utmp_put_shutdown();
if (r < 0)
- log_warning_errno(-r, "Failed to write utmp record: %m");
+ log_warning_errno(r, "Failed to write utmp record: %m");
}
}
return 0;
r = halt_now(arg_action);
- log_error_errno(-r, "Failed to reboot: %m");
+ log_error_errno(r, "Failed to reboot: %m");
return r;
}
r = send_shutdownd(arg_when, SD_SHUTDOWN_NONE, false, !arg_no_wall, m);
if (r < 0)
- log_warning_errno(-r, "Failed to talk to shutdownd, shutdown hasn't been cancelled: %m");
+ log_warning_errno(r, "Failed to talk to shutdownd, shutdown hasn't been cancelled: %m");
break;
}
if (i->uid_set) {
r = uid_is_ok(i->uid, i->name);
if (r < 0) {
- log_error_errno(-r, "Failed to verify uid " UID_FMT ": %m", i->uid);
+ log_error_errno(r, "Failed to verify uid " UID_FMT ": %m", i->uid);
return r;
}
if (r == 0) {
else {
r = uid_is_ok(c, i->name);
if (r < 0) {
- log_error_errno(-r, "Failed to verify uid " UID_FMT ": %m", i->uid);
+ log_error_errno(r, "Failed to verify uid " UID_FMT ": %m", i->uid);
return r;
} else if (r > 0) {
i->uid = c;
if (!i->uid_set && i->gid_set) {
r = uid_is_ok((uid_t) i->gid, i->name);
if (r < 0) {
- log_error_errno(-r, "Failed to verify uid " UID_FMT ": %m", i->uid);
+ log_error_errno(r, "Failed to verify uid " UID_FMT ": %m", i->uid);
return r;
}
if (r > 0) {
r = uid_is_ok(search_uid, i->name);
if (r < 0) {
- log_error_errno(-r, "Failed to verify uid " UID_FMT ": %m", i->uid);
+ log_error_errno(r, "Failed to verify uid " UID_FMT ": %m", i->uid);
return r;
} else if (r > 0)
break;
if (i->gid_set) {
r = gid_is_ok(i->gid);
if (r < 0) {
- log_error_errno(-r, "Failed to verify gid " GID_FMT ": %m", i->gid);
+ log_error_errno(r, "Failed to verify gid " GID_FMT ": %m", i->gid);
return r;
}
if (r == 0) {
if (!i->gid_set && i->uid_set) {
r = gid_is_ok((gid_t) i->uid);
if (r < 0) {
- log_error_errno(-r, "Failed to verify gid " GID_FMT ": %m", i->gid);
+ log_error_errno(r, "Failed to verify gid " GID_FMT ": %m", i->gid);
return r;
}
if (r > 0) {
else {
r = gid_is_ok(c);
if (r < 0) {
- log_error_errno(-r, "Failed to verify gid " GID_FMT ": %m", i->gid);
+ log_error_errno(r, "Failed to verify gid " GID_FMT ": %m", i->gid);
return r;
} else if (r > 0) {
i->gid = c;
r = gid_is_ok(search_uid);
if (r < 0) {
- log_error_errno(-r, "Failed to verify gid " GID_FMT ": %m", i->gid);
+ log_error_errno(r, "Failed to verify gid " GID_FMT ": %m", i->gid);
return r;
} else if (r > 0)
break;
if (ignore_enoent && r == -ENOENT)
return 0;
- log_error_errno(-r, "Failed to open '%s', ignoring: %m", fn);
+ log_error_errno(r, "Failed to open '%s', ignoring: %m", fn);
return r;
}
r = mac_selinux_init(NULL);
if (r < 0) {
- log_error_errno(-r, "SELinux setup failed: %m");
+ log_error_errno(r, "SELinux setup failed: %m");
goto finish;
}
r = conf_files_list_nulstr(&files, ".conf", arg_root, conf_file_dirs);
if (r < 0) {
- log_error_errno(-r, "Failed to enumerate sysusers.d files: %m");
+ log_error_errno(r, "Failed to enumerate sysusers.d files: %m");
goto finish;
}
lock = take_password_lock(arg_root);
if (lock < 0) {
- log_error_errno(-lock, "Failed to take lock: %m");
+ log_error_errno(lock, "Failed to take lock: %m");
goto finish;
}
r = load_user_database();
if (r < 0) {
- log_error_errno(-r, "Failed to load user database: %m");
+ log_error_errno(r, "Failed to load user database: %m");
goto finish;
}
r = load_group_database();
if (r < 0) {
- log_error_errno(-r, "Failed to read group database: %m");
+ log_error_errno(r, "Failed to read group database: %m");
goto finish;
}
r = write_files();
if (r < 0)
- log_error_errno(-r, "Failed to write files: %m");
+ log_error_errno(r, "Failed to write files: %m");
finish:
while ((i = hashmap_steal_first(groups)))
r = acpi_get_boot_usec(&loader_start, &loader_exit);
if (r < 0) {
if (r != -ENOENT)
- log_error_errno(-r, "Failed to read ACPI FPDT: %m");
+ log_error_errno(r, "Failed to read ACPI FPDT: %m");
return r;
}
r = efi_loader_get_boot_usec(&loader_start, &loader_exit);
if (r < 0) {
if (r != -ENOENT)
- log_error_errno(-r, "Failed to read EFI loader data: %m");
+ log_error_errno(r, "Failed to read EFI loader data: %m");
return r;
}
r = boot_timestamps(NULL, &fw, &l);
if (r < 0) {
- log_error_errno(-r, "Failed to read variables: %m");
+ log_error_errno(r, "Failed to read variables: %m");
return 1;
}
r = hostname_setup();
if (r < 0)
- log_error_errno(-r, "hostname: %m");
+ log_error_errno(r, "hostname: %m");
return 0;
}
PROTECT_SYSTEM_NO,
0);
if (r < 0) {
- log_error_errno(-r, "Failed to setup namespace: %m");
+ log_error_errno(r, "Failed to setup namespace: %m");
return 1;
}
_cleanup_close_ int sfd = -1, cfd = -1;
r = getnameinfo_pretty(STDIN_FILENO, &stdin_name);
- log_info_errno(-r, "No connection remote: %m");
+ log_info_errno(r, "No connection remote: %m");
assert_se(r < 0);
r = watchdog_set_timeout(&t);
if (r < 0)
- log_warning_errno(-r, "Failed to open watchdog: %m");
+ log_warning_errno(r, "Failed to open watchdog: %m");
for (i = 0; i < 5; i++) {
log_info("Pinging...");
r = watchdog_ping();
if (r < 0)
- log_warning_errno(-r, "Failed to ping watchdog: %m");
+ log_warning_errno(r, "Failed to ping watchdog: %m");
usleep(t/2);
}
map,
&info);
if (r < 0) {
- log_error_errno(-r, "Failed to query server: %m");
+ log_error_errno(r, "Failed to query server: %m");
goto fail;
}
r = get_timezones(&zones);
if (r < 0) {
- log_error_errno(-r, "Failed to read list of time zones: %m");
+ log_error_errno(r, "Failed to read list of time zones: %m");
return r;
}
r = bus_open_transport(arg_transport, arg_host, false, &bus);
if (r < 0) {
- log_error_errno(-r, "Failed to create bus connection: %m");
+ log_error_errno(r, "Failed to create bus connection: %m");
goto finish;
}
if (r == -EINVAL)
log_warning("/etc/localtime should be a symbolic link to a time zone data file in /usr/share/zoneinfo/.");
else
- log_warning_errno(-r, "Failed to get target of /etc/localtime: %m");
+ log_warning_errno(r, "Failed to get target of /etc/localtime: %m");
} else {
const char *e;
/* 1. Write new configuration file */
r = context_write_data_timezone(c);
if (r < 0) {
- log_error_errno(-r, "Failed to set time zone: %m");
+ log_error_errno(r, "Failed to set time zone: %m");
return sd_bus_error_set_errnof(error, r, "Failed to set time zone: %s", strerror(-r));
}
/* 1. Write new configuration file */
r = context_write_data_local_rtc(c);
if (r < 0) {
- log_error_errno(-r, "Failed to set RTC to local/UTC: %m");
+ log_error_errno(r, "Failed to set RTC to local/UTC: %m");
return sd_bus_error_set_errnof(error, r, "Failed to set RTC to local/UTC: %s", strerror(-r));
}
r = sd_bus_default_system(&bus);
if (r < 0) {
- log_error_errno(-r, "Failed to get system bus connection: %m");
+ log_error_errno(r, "Failed to get system bus connection: %m");
return r;
}
r = sd_bus_add_object_vtable(bus, NULL, "/org/freedesktop/timedate1", "org.freedesktop.timedate1", timedate_vtable, c);
if (r < 0) {
- log_error_errno(-r, "Failed to register object: %m");
+ log_error_errno(r, "Failed to register object: %m");
return r;
}
r = sd_bus_request_name(bus, "org.freedesktop.timedate1", 0);
if (r < 0) {
- log_error_errno(-r, "Failed to register name: %m");
+ log_error_errno(r, "Failed to register name: %m");
return r;
}
r = sd_bus_attach_event(bus, event, 0);
if (r < 0) {
- log_error_errno(-r, "Failed to attach bus to event loop: %m");
+ log_error_errno(r, "Failed to attach bus to event loop: %m");
return r;
}
r = sd_event_default(&event);
if (r < 0) {
- log_error_errno(-r, "Failed to allocate event loop: %m");
+ log_error_errno(r, "Failed to allocate event loop: %m");
goto finish;
}
r = context_read_data(&context);
if (r < 0) {
- log_error_errno(-r, "Failed to read time zone data: %m");
+ log_error_errno(r, "Failed to read time zone data: %m");
goto finish;
}
r = context_read_ntp(&context, bus);
if (r < 0) {
- log_error_errno(-r, "Failed to determine whether NTP is enabled: %m");
+ log_error_errno(r, "Failed to determine whether NTP is enabled: %m");
goto finish;
}
r = bus_event_loop_with_idle(event, bus, "org.freedesktop.timedate1", DEFAULT_EXIT_USEC, NULL, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to run event loop: %m");
+ log_error_errno(r, "Failed to run event loop: %m");
goto finish;
}
if (m->server_socket < 0) {
r = manager_listen_setup(m);
if (r < 0) {
- log_warning_errno(-r, "Failed to setup connection socket: %m");
+ log_warning_errno(r, "Failed to setup connection socket: %m");
return r;
}
}
r = manager_arm_timer(m, m->retry_interval);
if (r < 0) {
- log_error_errno(-r, "Failed to rearm timer: %m");
+ log_error_errno(r, "Failed to rearm timer: %m");
return r;
}
now(clock_boottime_or_monotonic()) + TIMEOUT_USEC, 0,
manager_timeout, m);
if (r < 0) {
- log_error_errno(-r, "Failed to arm timeout timer: %m");
+ log_error_errno(r, "Failed to arm timeout timer: %m");
return r;
}
}
r = sd_event_add_io(m->event, &m->event_clock_watch, m->clock_watch_fd, EPOLLIN, manager_clock_watch, m);
if (r < 0) {
- log_error_errno(-r, "Failed to create clock watch event source: %m");
+ log_error_errno(r, "Failed to create clock watch event source: %m");
return r;
}
r = manager_arm_timer(m, m->poll_interval_usec);
if (r < 0) {
- log_error_errno(-r, "Failed to rearm timer: %m");
+ log_error_errno(r, "Failed to rearm timer: %m");
return r;
}
r = server_address_new(m->current_server_name, &a, (const union sockaddr_union*) ai->ai_addr, ai->ai_addrlen);
if (r < 0) {
- log_error_errno(-r, "Failed to add server address: %m");
+ log_error_errno(r, "Failed to add server address: %m");
return r;
}
r = sd_event_add_time(m->event, &m->event_retry, clock_boottime_or_monotonic(), now(clock_boottime_or_monotonic()) + RETRY_USEC, 0, manager_retry_connect, m);
if (r < 0) {
- log_error_errno(-r, "Failed to create retry timer: %m");
+ log_error_errno(r, "Failed to create retry timer: %m");
return r;
}
log_debug("Waiting after exhausting servers.");
r = sd_event_add_time(m->event, &m->event_retry, clock_boottime_or_monotonic(), now(clock_boottime_or_monotonic()) + m->poll_interval_usec, 0, manager_retry_connect, m);
if (r < 0) {
- log_error_errno(-r, "Failed to create retry timer: %m");
+ log_error_errno(r, "Failed to create retry timer: %m");
return r;
}
r = sd_resolve_getaddrinfo(m->resolve, &m->resolve_query, m->current_server_name->string, "123", &hints, manager_resolve_handler, m);
if (r < 0) {
- log_error_errno(-r, "Failed to create resolver: %m");
+ log_error_errno(r, "Failed to create resolver: %m");
return r;
}
r = get_user_creds(&user, &uid, &gid, NULL, NULL);
if (r < 0) {
- log_error_errno(-r, "Cannot resolve user name %s: %m", user);
+ log_error_errno(r, "Cannot resolve user name %s: %m", user);
goto finish;
}
r = manager_new(&m);
if (r < 0) {
- log_error_errno(-r, "Failed to allocate manager: %m");
+ log_error_errno(r, "Failed to allocate manager: %m");
goto finish;
}
r = manager_parse_config_file(m);
if (r < 0)
- log_warning_errno(-r, "Failed to parse configuration file: %m");
+ log_warning_errno(r, "Failed to parse configuration file: %m");
log_debug("systemd-timesyncd running as pid %lu", (unsigned long) getpid());
sd_notify(false,
r = sd_event_loop(m->event);
if (r < 0) {
- log_error_errno(-r, "Failed to run event loop: %m");
+ log_error_errno(r, "Failed to run event loop: %m");
goto finish;
}
struct stat a, b;
if (r != -EEXIST) {
- log_error_errno(-r, "Failed to copy files to %s: %m", i->path);
+ log_error_errno(r, "Failed to copy files to %s: %m", i->path);
return -r;
}
if (r < 0) {
if (r != -EEXIST) {
- log_error_errno(-r, "Failed to create directory %s: %m", i->path);
+ log_error_errno(r, "Failed to create directory %s: %m", i->path);
return r;
}
}
if (r < 0) {
- log_error_errno(-r, "Failed to create fifo %s: %m", i->path);
+ log_error_errno(r, "Failed to create fifo %s: %m", i->path);
return r;
}
} else {
mac_selinux_create_file_clear();
if (r < 0) {
- log_error_errno(-r, "symlink(%s, %s) failed: %m", i->argument, i->path);
+ log_error_errno(r, "symlink(%s, %s) failed: %m", i->argument, i->path);
return r;
}
} else {
}
if (r < 0) {
- log_error_errno(-r, "Failed to create device node %s: %m", i->path);
+ log_error_errno(r, "Failed to create device node %s: %m", i->path);
return r;
}
} else {
* instead of rm_rf() so that 'x' is honoured. */
r = rm_rf_dangerous(instance, false, i->type == RECURSIVE_REMOVE_PATH, false);
if (r < 0 && r != -ENOENT) {
- log_error_errno(-r, "rm_rf(%s): %m", instance);
+ log_error_errno(r, "rm_rf(%s): %m", instance);
return r;
}
r = hashmap_put(h, i->path, i);
if (r < 0) {
- log_error_errno(-r, "Failed to insert item %s: %m", i->path);
+ log_error_errno(r, "Failed to insert item %s: %m", i->path);
return r;
}
if (ignore_enoent && r == -ENOENT)
return 0;
- log_error_errno(-r, "Failed to open '%s', ignoring: %m", fn);
+ log_error_errno(r, "Failed to open '%s', ignoring: %m", fn);
return r;
}
r = conf_files_list_nulstr(&files, ".conf", arg_root, conf_file_dirs);
if (r < 0) {
- log_error_errno(-r, "Failed to enumerate tmpfiles.d files: %m");
+ log_error_errno(r, "Failed to enumerate tmpfiles.d files: %m");
goto finish;
}
return 0;
if (r < 0) {
- log_error_errno(-r, "Failed to query password: %m");
+ log_error_errno(r, "Failed to query password: %m");
return r;
}
for (;;) {
r = show_passwords();
if (r < 0)
- log_error_errno(-r, "Failed to show password: %m");
+ log_error_errno(r, "Failed to show password: %m");
if (poll(pollfd, _FD_MAX, -1) < 0) {
if (errno == EINTR)
r = show_passwords();
if (r < 0)
- log_error_errno(-r, "Error: %m");
+ log_error_errno(r, "Error: %m");
finish:
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
if (*fd < 0) {
r = ethtool_connect(fd);
if (r < 0) {
- log_warning_errno(-r, "link_config: could not connect to ethtool: %m");
+ log_warning_errno(r, "link_config: could not connect to ethtool: %m");
return r;
}
}
if (*fd < 0) {
r = ethtool_connect(fd);
if (r < 0) {
- log_warning_errno(-r, "link_config: could not connect to ethtool: %m");
+ log_warning_errno(r, "link_config: could not connect to ethtool: %m");
return r;
}
}
if (*fd < 0) {
r = ethtool_connect(fd);
if (r < 0) {
- log_warning_errno(-r, "link_config: could not connect to ethtool: %m");
+ log_warning_errno(r, "link_config: could not connect to ethtool: %m");
return r;
}
}
r = proc_cmdline(&line);
if (r < 0) {
- log_warning_errno(-r, "Failed to read /proc/cmdline, ignoring: %m");
+ log_warning_errno(r, "Failed to read /proc/cmdline, ignoring: %m");
return true;
}
r = conf_files_list_strv(&files, ".link", NULL, link_dirs);
if (r < 0) {
- log_error_errno(-r, "failed to enumerate link files: %m");
+ log_error_errno(r, "failed to enumerate link files: %m");
return r;
}
log_debug("keyboard: updating force-release list with '%s'", codes);
ret = udev_device_set_sysattr_value(atkbd, "force_release", codes);
if (ret < 0)
- log_error_errno(-ret, "Error writing force-release attribute: %m");
+ log_error_errno(ret, "Error writing force-release attribute: %m");
return ret;
}
log_debug("No matching link configuration found.");
return EXIT_SUCCESS;
} else {
- log_error_errno(-r, "Could not get link config: %m");
+ log_error_errno(r, "Could not get link config: %m");
return EXIT_FAILURE;
}
}
r = link_config_apply(ctx, link, dev, &name);
if (r < 0) {
- log_error_errno(-r, "Could not apply link config to %s: %m", udev_device_get_sysname(dev));
+ log_error_errno(r, "Could not apply link config to %s: %m", udev_device_get_sysname(dev));
return EXIT_FAILURE;
}
r = devnode_acl(path, true, false, 0, true, uid);
if (r < 0) {
- log_error_errno(-r, "Failed to apply ACL on %s: %m", path);
+ log_error_errno(r, "Failed to apply ACL on %s: %m", path);
goto finish;
}
/* Better be safe than sorry and reset ACL */
k = devnode_acl(path, true, false, 0, false, 0);
if (k < 0) {
- log_error_errno(-k, "Failed to apply ACL on %s: %m", path);
+ log_error_errno(k, "Failed to apply ACL on %s: %m", path);
if (r >= 0)
r = k;
}
/* check peer credential of connection */
r = getpeercred(conn->sock, &ucred);
if (r < 0) {
- log_error_errno(-r, "unable to receive credentials of ctrl connection: %m");
+ log_error_errno(r, "unable to receive credentials of ctrl connection: %m");
goto err;
}
if (ucred.uid > 0) {
r = mac_selinux_apply(devnode, label);
if (r < 0)
- log_error_errno(-r, "SECLABEL: failed to set SELinux label '%s': %m", label);
+ log_error_errno(r, "SECLABEL: failed to set SELinux label '%s': %m", label);
else
log_debug("SECLABEL: set SELinux label '%s'", label);
r = mac_smack_apply(devnode, label);
if (r < 0)
- log_error_errno(-r, "SECLABEL: failed to set SMACK label '%s': %m", label);
+ log_error_errno(r, "SECLABEL: failed to set SMACK label '%s': %m", label);
else
log_debug("SECLABEL: set SMACK label '%s'", label);
r = conf_files_list_strv(&files, ".rules", NULL, rules_dirs);
if (r < 0) {
- log_error_errno(-r, "failed to enumerate rules files: %m");
+ log_error_errno(r, "failed to enumerate rules files: %m");
return udev_rules_unref(rules);
}
strscpyl(tags_dir, sizeof(tags_dir), "/run/udev/static_node-tags/", *t, "/", NULL);
r = mkdir_p(tags_dir, 0755);
if (r < 0) {
- log_error_errno(-r, "failed to create %s: %m", tags_dir);
+ log_error_errno(r, "failed to create %s: %m", tags_dir);
return r;
}
err = conf_files_list_strv(&files, ".hwdb", root, conf_file_dirs);
if (err < 0) {
- log_error_errno(-err, "failed to enumerate hwdb files: %m");
+ log_error_errno(err, "failed to enumerate hwdb files: %m");
rc = EXIT_FAILURE;
goto out;
}
mkdir_parents(hwdb_bin, 0755);
err = trie_store(trie, hwdb_bin);
if (err < 0) {
- log_error_errno(-err, "Failure writing database %s: %m", hwdb_bin);
+ log_error_errno(err, "Failure writing database %s: %m", hwdb_bin);
rc = EXIT_FAILURE;
}
}
r = proc_cmdline(&line);
if (r < 0) {
- log_warning_errno(-r, "Failed to read /proc/cmdline, ignoring: %m");
+ log_warning_errno(r, "Failed to read /proc/cmdline, ignoring: %m");
return;
}
r = mac_selinux_init("/dev");
if (r < 0) {
- log_error_errno(-r, "could not initialize labelling: %m");
+ log_error_errno(r, "could not initialize labelling: %m");
goto exit;
}
rc = udev_rules_apply_static_dev_perms(rules);
if (rc < 0)
- log_error_errno(-rc, "failed to apply permissions on static device nodes - %m");
+ log_error_errno(rc, "failed to apply permissions on static device nodes - %m");
if (arg_daemonize) {
pid_t pid;
r = mac_selinux_init(NULL);
if (r < 0) {
- log_error_errno(-r, "SELinux setup failed: %m");
+ log_error_errno(r, "SELinux setup failed: %m");
goto finish;
}
q = utmp_put_reboot(t);
if (q < 0) {
- log_error_errno(-q, "Failed to write utmp record: %m");
+ log_error_errno(q, "Failed to write utmp record: %m");
r = q;
}
q = utmp_put_shutdown();
if (q < 0) {
- log_error_errno(-q, "Failed to write utmp record: %m");
+ log_error_errno(q, "Failed to write utmp record: %m");
r = q;
}
if (q < 0) {
if (q != -ESRCH && q != -ENOENT) {
- log_error_errno(-q, "Failed to get current runlevel: %m");
+ log_error_errno(q, "Failed to get current runlevel: %m");
return q;
}
q = utmp_put_runlevel(runlevel, previous);
if (q < 0 && q != -ESRCH && q != -ENOENT) {
- log_error_errno(-q, "Failed to write utmp record: %m");
+ log_error_errno(q, "Failed to write utmp record: %m");
r = q;
}
#endif
r = bus_open_system_systemd(&c.bus);
if (r < 0) {
- log_error_errno(-r, "Failed to get D-Bus connection: %m");
+ log_error_errno(r, "Failed to get D-Bus connection: %m");
r = -EIO;
goto finish;
}
r = k;
if (r < 0)
- log_warning_errno(-r, "Failed to disable UTF-8: %m");
+ log_warning_errno(r, "Failed to disable UTF-8: %m");
return r;
}
r = k;
if (r < 0)
- log_warning_errno(-r, "Failed to enable UTF-8: %m");
+ log_warning_errno(r, "Failed to enable UTF-8: %m");
return r;
}
NULL);
if (r < 0 && r != -ENOENT)
- log_warning_errno(-r, "Failed to read /etc/vconsole.conf: %m");
+ log_warning_errno(r, "Failed to read /etc/vconsole.conf: %m");
/* Let the kernel command line override /etc/vconsole.conf */
if (detect_container(NULL) <= 0) {
NULL);
if (r < 0 && r != -ENOENT)
- log_warning_errno(-r, "Failed to read /proc/cmdline: %m");
+ log_warning_errno(r, "Failed to read /proc/cmdline: %m");
}
if (utf8)
r = font_load(vc, vc_font, vc_font_map, vc_font_unimap, &font_pid);
if (r < 0) {
- log_error_errno(-r, "Failed to start " KBD_SETFONT ": %m");
+ log_error_errno(r, "Failed to start " KBD_SETFONT ": %m");
return EXIT_FAILURE;
}
r = keymap_load(vc, vc_keymap, vc_keymap_toggle, utf8, &keymap_pid);
if (r < 0) {
- log_error_errno(-r, "Failed to start " KBD_LOADKEYS ": %m");
+ log_error_errno(r, "Failed to start " KBD_LOADKEYS ": %m");
return EXIT_FAILURE;
}
~ianmdlvl / elogind.git / commitdiff