#include "cgroup-show.h"
#include "cgroup-util.h"
#include "ptyfwd.h"
+#include "event-util.h"
static char **arg_property = NULL;
static bool arg_all = false;
map,
&info);
if (r < 0) {
- log_error("Could not get properties: %s", strerror(-r));
+ 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("Could not get properties: %s", strerror(-r));
+ log_error_errno(-r, "Could not get properties: %m");
return r;
}
static int login_machine(sd_bus *bus, char **args, unsigned n) {
_cleanup_bus_message_unref_ sd_bus_message *reply = NULL, *reply2 = NULL, *reply3 = NULL;
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
- _cleanup_bus_unref_ sd_bus *container_bus = NULL;
+ _cleanup_bus_close_unref_ sd_bus *container_bus = NULL;
+ _cleanup_(pty_forward_freep) PTYForward *forward = NULL;
+ _cleanup_event_unref_ sd_event *event = NULL;
_cleanup_close_ int master = -1;
_cleanup_free_ char *getty = NULL;
const char *path, *pty, *p;
uint32_t leader;
sigset_t mask;
- int r;
+ int r, ret = 0;
assert(bus);
assert(args);
return -ENOTSUP;
}
+ r = sd_event_default(&event);
+ if (r < 0) {
+ 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");
+ return r;
+ }
+
r = sd_bus_call_method(
bus,
"org.freedesktop.machine1",
&reply2,
"u");
if (r < 0) {
- log_error("Failed to retrieve PID of leader: %s", strerror(-r));
+ 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("Failed to acquire pseudo tty: %s", strerror(-master));
+ 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("Failed to get container bus: %s", strerror(-r));
+ log_error_errno(-r, "Failed to get container bus: %m");
return r;
}
log_info("Connected to container %s. Press ^] three times within 1s to exit session.", args[1]);
- r = process_pty(master, &mask, 0, 0);
+ sd_event_add_signal(event, NULL, SIGINT, NULL, NULL);
+ sd_event_add_signal(event, NULL, SIGTERM, NULL, NULL);
+
+ r = pty_forward_new(event, master, &forward);
+ if (r < 0) {
+ log_error_errno(-r, "Failed to create PTY forwarder: %m");
+ return r;
+ }
+
+ r = sd_event_loop(event);
if (r < 0) {
- log_error("Failed to process pseudo tty: %s", strerror(-r));
+ log_error_errno(-r, "Failed to run event loop: %m");
return r;
}
+ forward = pty_forward_free(forward);
+
fputc('\n', stdout);
log_info("Connection to container %s terminated.", args[1]);
- return 0;
+ sd_event_get_exit_code(event, &ret);
+ return ret;
}
-static int help(void) {
-
+static void help(void) {
printf("%s [OPTIONS...] {COMMAND} ...\n\n"
"Send control commands to or query the virtual machine and container registration manager.\n\n"
" -h --help Show this help\n"
" kill NAME... Send signal to processes of a VM/container\n"
" terminate NAME... Terminate one or more VMs/containers\n",
program_invocation_short_name);
-
- return 0;
}
static int parse_argv(int argc, char *argv[]) {
assert(argc >= 0);
assert(argv);
- while ((c = getopt_long(argc, argv, "hp:als:H:M:", options, NULL)) >= 0) {
+ while ((c = getopt_long(argc, argv, "hp:als:H:M:", options, NULL)) >= 0)
switch (c) {
case 'h':
- return help();
+ help();
+ return 0;
case ARG_VERSION:
puts(PACKAGE_STRING);
default:
assert_not_reached("Unhandled option");
}
- }
return 1;
}
}
int main(int argc, char*argv[]) {
- _cleanup_bus_unref_ sd_bus *bus = NULL;
+ _cleanup_bus_close_unref_ sd_bus *bus = NULL;
int r;
setlocale(LC_ALL, "");
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;
}