chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rtnl: when querying local addresses and gateways, take address family into account
[elogind.git]
/
src
/
machine
/
machinectl.c
diff --git
a/src/machine/machinectl.c
b/src/machine/machinectl.c
index bbcc2df4cdf6d271210ced74d36ca52e52815443..f604263d8f2cfd8c7a991144776924c84e4e139c 100644
(file)
--- a/
src/machine/machinectl.c
+++ b/
src/machine/machinectl.c
@@
-414,10
+414,8
@@
static int show_info(const char *verb, sd_bus *bus, const char *path, bool *new_
path,
map,
&info);
path,
map,
&info);
- if (r < 0) {
- log_error("Could not get properties: %s", strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Could not get properties: %m");
if (*new_line)
printf("\n");
if (*new_line)
printf("\n");
@@
-445,7
+443,7
@@
static int show_properties(sd_bus *bus, const char *path, bool *new_line) {
r = bus_print_all_properties(bus, "org.freedesktop.machine1", path, arg_property, arg_all);
if (r < 0)
r = bus_print_all_properties(bus, "org.freedesktop.machine1", path, arg_property, arg_all);
if (r < 0)
- log_error
("Could not get properties: %s", strerror(-r)
);
+ log_error
_errno(r, "Could not get properties: %m"
);
return r;
}
return r;
}
@@
-681,16
+679,12
@@
static int login_machine(sd_bus *bus, char **args, unsigned n) {
}
r = sd_event_default(&event);
}
r = sd_event_default(&event);
- if (r < 0) {
- log_error("Failed to get event loop: %s", strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to get event loop: %m");
r = sd_bus_attach_event(bus, event, 0);
r = sd_bus_attach_event(bus, event, 0);
- if (r < 0) {
- log_error("Failed to attach bus to event loop: %s", strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to attach bus to event loop: %m");
r = sd_bus_call_method(
bus,
r = sd_bus_call_method(
bus,
@@
-719,26
+713,20
@@
static int login_machine(sd_bus *bus, char **args, unsigned n) {
&error,
&reply2,
"u");
&error,
&reply2,
"u");
- if (r < 0) {
- log_error("Failed to retrieve PID of leader: %s", strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to retrieve PID of leader: %m");
r = sd_bus_message_read(reply2, "u", &leader);
if (r < 0)
return bus_log_parse_error(r);
master = openpt_in_namespace(leader, O_RDWR|O_NOCTTY|O_CLOEXEC|O_NDELAY);
r = sd_bus_message_read(reply2, "u", &leader);
if (r < 0)
return bus_log_parse_error(r);
master = openpt_in_namespace(leader, O_RDWR|O_NOCTTY|O_CLOEXEC|O_NDELAY);
- if (master < 0) {
- log_error("Failed to acquire pseudo tty: %s", strerror(-master));
- return master;
- }
+ if (master < 0)
+ return log_error_errno(master, "Failed to acquire pseudo tty: %m");
pty = ptsname(master);
pty = ptsname(master);
- if (!pty) {
- log_error("Failed to get pty name: %m");
- return -errno;
- }
+ if (!pty)
+ return log_error_errno(errno, "Failed to get pty name: %m");
p = startswith(pty, "/dev/pts/");
if (!p) {
p = startswith(pty, "/dev/pts/");
if (!p) {
@@
-747,19
+735,15
@@
static int login_machine(sd_bus *bus, char **args, unsigned n) {
}
r = sd_bus_open_system_container(&container_bus, args[1]);
}
r = sd_bus_open_system_container(&container_bus, args[1]);
- if (r < 0) {
- log_error("Failed to get container bus: %s", strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to get container bus: %m");
getty = strjoin("container-getty@", p, ".service", NULL);
if (!getty)
return log_oom();
getty = strjoin("container-getty@", p, ".service", NULL);
if (!getty)
return log_oom();
- if (unlockpt(master) < 0) {
- log_error("Failed to unlock tty: %m");
- return -errno;
- }
+ if (unlockpt(master) < 0)
+ return log_error_errno(errno, "Failed to unlock tty: %m");
r = sd_bus_call_method(container_bus,
"org.freedesktop.systemd1",
r = sd_bus_call_method(container_bus,
"org.freedesktop.systemd1",
@@
-785,16
+769,12
@@
static int login_machine(sd_bus *bus, char **args, unsigned n) {
sd_event_add_signal(event, NULL, SIGTERM, NULL, NULL);
r = pty_forward_new(event, master, &forward);
sd_event_add_signal(event, NULL, SIGTERM, NULL, NULL);
r = pty_forward_new(event, master, &forward);
- if (r < 0) {
- log_error("Failed to create PTY forwarder: %s", strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to create PTY forwarder: %m");
r = sd_event_loop(event);
r = sd_event_loop(event);
- if (r < 0) {
- log_error("Failed to run event loop: %s", strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to run event loop: %m");
forward = pty_forward_free(forward);
forward = pty_forward_free(forward);
@@
-1029,7
+1009,7
@@
int main(int argc, char*argv[]) {
r = bus_open_transport(arg_transport, arg_host, false, &bus);
if (r < 0) {
r = bus_open_transport(arg_transport, arg_host, false, &bus);
if (r < 0) {
- log_error
("Failed to create bus connection: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to create bus connection: %m"
);
goto finish;
}
goto finish;
}