X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fmachine%2Fmachinectl.c;h=c2bf7e519797ef574b02246e1df1f9bedf37385c;hp=f60c66055dd7258e5d823302f30e90d920cb4147;hb=878cd7e95ca303f9851d227a22d2022bd49944b0;hpb=46e65dcc3a522b5e992e165b5e61d14254026859 diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c index f60c66055..c2bf7e519 100644 --- a/src/machine/machinectl.c +++ b/src/machine/machinectl.c @@ -27,6 +27,8 @@ #include #include #include +#include +#include #include "sd-bus.h" #include "log.h" @@ -46,9 +48,9 @@ static char **arg_property = NULL; static bool arg_all = false; static bool arg_full = false; static bool arg_no_pager = false; +static bool arg_legend = true; static const char *arg_kill_who = NULL; static int arg_signal = SIGTERM; -static bool arg_ask_password = true; static BusTransport arg_transport = BUS_TRANSPORT_LOCAL; static char *arg_host = NULL; @@ -84,12 +86,12 @@ static int list_machines(sd_bus *bus, char **args, unsigned n) { return r; } - if (on_tty()) + if (arg_legend) printf("%-32s %-9s %-16s\n", "MACHINE", "CONTAINER", "SERVICE"); r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_ARRAY, "(ssso)"); if (r < 0) - goto fail; + return bus_log_parse_error(r); while ((r = sd_bus_message_read(reply, "(ssso)", &name, &class, &service, &object)) > 0) { printf("%-32s %-9s %-16s\n", name, class, service); @@ -97,23 +99,19 @@ static int list_machines(sd_bus *bus, char **args, unsigned n) { k++; } if (r < 0) - goto fail; + return bus_log_parse_error(r); r = sd_bus_message_exit_container(reply); if (r < 0) - goto fail; + return bus_log_parse_error(r); - if (on_tty()) + if (arg_legend) printf("\n%u machines listed.\n", k); return 0; - -fail: - log_error("Failed to parse reply: %s", strerror(-r)); - return r; } -static int show_scope_cgroup(sd_bus *bus, const char *unit, pid_t leader) { +static int show_unit_cgroup(sd_bus *bus, const char *unit, pid_t leader) { _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; _cleanup_free_ char *path = NULL; @@ -135,7 +133,7 @@ static int show_scope_cgroup(sd_bus *bus, const char *unit, pid_t leader) { bus, "org.freedesktop.systemd1", path, - "org.freedesktop.systemd1.Scope", + endswith(unit, ".scope") ? "org.freedesktop.systemd1.Scope" : "org.freedesktop.systemd1.Service", "ControlGroup", &error, &reply, @@ -146,10 +144,8 @@ static int show_scope_cgroup(sd_bus *bus, const char *unit, pid_t leader) { } r = sd_bus_message_read(reply, "s", &cgroup); - if (r < 0) { - log_error("Failed to parse reply: %s", strerror(-r)); - return r; - } + if (r < 0) + return bus_log_parse_error(r); if (isempty(cgroup)) return 0; @@ -171,12 +167,69 @@ static int show_scope_cgroup(sd_bus *bus, const char *unit, pid_t leader) { return 0; } +static int print_addresses(sd_bus *bus, const char *name, const char *prefix, const char *prefix2) { + _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; + int r; + + assert(bus); + assert(name); + assert(prefix); + assert(prefix2); + + r = sd_bus_call_method(bus, + "org.freedesktop.machine1", + "/org/freedesktop/machine1", + "org.freedesktop.machine1.Manager", + "GetMachineAddresses", + NULL, + &reply, + "s", name); + if (r < 0) + return r; + + r = sd_bus_message_enter_container(reply, 'a', "(yay)"); + if (r < 0) + return bus_log_parse_error(r); + + while ((r = sd_bus_message_enter_container(reply, 'r', "yay")) > 0) { + unsigned char family; + const void *a; + size_t sz; + char buffer[MAX(INET6_ADDRSTRLEN, INET_ADDRSTRLEN)]; + + r = sd_bus_message_read(reply, "y", &family); + if (r < 0) + return bus_log_parse_error(r); + + r = sd_bus_message_read_array(reply, 'y', &a, &sz); + if (r < 0) + return bus_log_parse_error(r); + + printf("%s%s\n", prefix, inet_ntop(family, a, buffer, sizeof(buffer))); + + r = sd_bus_message_exit_container(reply); + if (r < 0) + return bus_log_parse_error(r); + + if (prefix != prefix2) + prefix = prefix2; + } + if (r < 0) + return bus_log_parse_error(r); + + r = sd_bus_message_exit_container(reply); + if (r < 0) + return bus_log_parse_error(r); + + return 0; +} + typedef struct MachineStatusInfo { char *name; sd_id128_t id; char *class; char *service; - char *scope; + char *unit; char *root_directory; pid_t leader; usec_t timestamp; @@ -227,25 +280,31 @@ static void print_machine_status_info(sd_bus *bus, MachineStatusInfo *i) { if (i->root_directory) printf("\t Root: %s\n", i->root_directory); - if (i->scope) { - printf("\t Unit: %s\n", i->scope); - show_scope_cgroup(bus, i->scope, i->leader); + print_addresses(bus, i->name, + "\t Address: ", + "\t "); + + if (i->unit) { + printf("\t Unit: %s\n", i->unit); + show_unit_cgroup(bus, i->unit, i->leader); } } static int show_info(const char *verb, sd_bus *bus, const char *path, bool *new_line) { - MachineStatusInfo info = {}; + static const struct bus_properties_map map[] = { { "Name", "s", NULL, offsetof(MachineStatusInfo, name) }, { "Class", "s", NULL, offsetof(MachineStatusInfo, class) }, { "Service", "s", NULL, offsetof(MachineStatusInfo, service) }, - { "Scope", "s", NULL, offsetof(MachineStatusInfo, scope) }, + { "Unit", "s", NULL, offsetof(MachineStatusInfo, unit) }, { "RootDirectory", "s", NULL, offsetof(MachineStatusInfo, root_directory) }, { "Leader", "u", NULL, offsetof(MachineStatusInfo, leader) }, { "Timestamp", "t", NULL, offsetof(MachineStatusInfo, timestamp) }, { "Id", "ay", bus_map_id128, offsetof(MachineStatusInfo, id) }, {} }; + + MachineStatusInfo info = {}; int r; assert(path); @@ -270,7 +329,7 @@ static int show_info(const char *verb, sd_bus *bus, const char *path, bool *new_ free(info.name); free(info.class); free(info.service); - free(info.scope); + free(info.unit); free(info.root_directory); return r; @@ -310,10 +369,8 @@ static int show(sd_bus *bus, char **args, unsigned n) { /* If no argument is specified, inspect the manager * itself */ r = show_properties(bus, "/org/freedesktop/machine1", &new_line); - if (r < 0) { - log_error("Failed to query properties: %s", strerror(-r)); + if (r < 0) return r; - } } for (i = 1; i < n; i++) { @@ -334,10 +391,8 @@ static int show(sd_bus *bus, char **args, unsigned n) { } r = sd_bus_message_read(reply, "o", &path); - if (r < 0) { - log_error("Failed to parse reply: %s", strerror(-r)); - break; - } + if (r < 0) + return bus_log_parse_error(r); if (properties) r = show_properties(bus, path, &new_line); @@ -378,6 +433,20 @@ static int kill_machine(sd_bus *bus, char **args, unsigned n) { return 0; } +static int reboot_machine(sd_bus *bus, char **args, unsigned n) { + arg_kill_who = "leader"; + arg_signal = SIGINT; /* sysvinit + systemd */ + + return kill_machine(bus, args, n); +} + +static int poweroff_machine(sd_bus *bus, char **args, unsigned n) { + arg_kill_who = "leader"; + arg_signal = SIGRTMIN+4; /* only systemd */ + + return kill_machine(bus, args, n); +} + static int terminate_machine(sd_bus *bus, char **args, unsigned n) { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; unsigned i; @@ -406,9 +475,8 @@ static int terminate_machine(sd_bus *bus, char **args, unsigned n) { } static int openpt_in_namespace(pid_t pid, int flags) { - _cleanup_close_ int nsfd = -1, rootfd = -1; - _cleanup_free_ char *ns = NULL, *root = NULL; - _cleanup_close_pipe_ int sock[2] = { -1, -1 }; + _cleanup_close_pair_ int pair[2] = { -1, -1 }; + _cleanup_close_ int pidnsfd = -1, mntnsfd = -1, rootfd = -1; union { struct cmsghdr cmsghdr; uint8_t buf[CMSG_SPACE(sizeof(int))]; @@ -422,23 +490,11 @@ static int openpt_in_namespace(pid_t pid, int flags) { pid_t child; siginfo_t si; - r = asprintf(&ns, "/proc/%lu/ns/mnt", (unsigned long) pid); - if (r < 0) - return -ENOMEM; - - nsfd = open(ns, O_RDONLY|O_NOCTTY|O_CLOEXEC); - if (nsfd < 0) - return -errno; - - r = asprintf(&root, "/proc/%lu/root", (unsigned long) pid); + r = namespace_open(pid, &pidnsfd, &mntnsfd, NULL, &rootfd); if (r < 0) - return -ENOMEM; - - rootfd = open(root, O_RDONLY|O_NOCTTY|O_CLOEXEC|O_DIRECTORY); - if (rootfd < 0) - return -errno; + return r; - if (socketpair(AF_UNIX, SOCK_DGRAM, 0, sock) < 0) + if (socketpair(AF_UNIX, SOCK_DGRAM, 0, pair) < 0) return -errno; child = fork(); @@ -446,19 +502,12 @@ static int openpt_in_namespace(pid_t pid, int flags) { return -errno; if (child == 0) { - close_nointr_nofail(sock[0]); - sock[0] = -1; + pair[0] = safe_close(pair[0]); - r = setns(nsfd, CLONE_NEWNS); + r = namespace_enter(pidnsfd, mntnsfd, -1, rootfd); if (r < 0) _exit(EXIT_FAILURE); - if (fchdir(rootfd) < 0) - _exit(EXIT_FAILURE); - - if (chroot(".") < 0) - _exit(EXIT_FAILURE); - master = posix_openpt(flags); if (master < 0) _exit(EXIT_FAILURE); @@ -471,18 +520,21 @@ static int openpt_in_namespace(pid_t pid, int flags) { mh.msg_controllen = cmsg->cmsg_len; - r = sendmsg(sock[1], &mh, MSG_NOSIGNAL); - close_nointr_nofail(master); - if (r < 0) + if (sendmsg(pair[1], &mh, MSG_NOSIGNAL) < 0) _exit(EXIT_FAILURE); _exit(EXIT_SUCCESS); } - close_nointr_nofail(sock[1]); - sock[1] = -1; + pair[1] = safe_close(pair[1]); + + r = wait_for_terminate(child, &si); + if (r < 0) + return r; + if (si.si_code != CLD_EXITED || si.si_status != EXIT_SUCCESS) + return -EIO; - if (recvmsg(sock[0], &mh, MSG_NOSIGNAL|MSG_CMSG_CLOEXEC) < 0) + if (recvmsg(pair[0], &mh, MSG_NOSIGNAL|MSG_CMSG_CLOEXEC) < 0) return -errno; for (cmsg = CMSG_FIRSTHDR(&mh); cmsg; cmsg = CMSG_NXTHDR(&mh, cmsg)) @@ -501,14 +553,8 @@ static int openpt_in_namespace(pid_t pid, int flags) { master = fds[0]; } - r = wait_for_terminate(child, &si); - if (r < 0 || si.si_code != CLD_EXITED || si.si_status != EXIT_SUCCESS || master < 0) { - - if (master >= 0) - close_nointr_nofail(master); - - return r < 0 ? r : -EIO; - } + if (master < 0) + return -EIO; return master; } @@ -528,7 +574,7 @@ static int login_machine(sd_bus *bus, char **args, unsigned n) { assert(args); if (arg_transport != BUS_TRANSPORT_LOCAL) { - log_error("Login only support on local machines."); + log_error("Login only supported on local machines."); return -ENOTSUP; } @@ -547,10 +593,8 @@ static int login_machine(sd_bus *bus, char **args, unsigned n) { } r = sd_bus_message_read(reply, "o", &path); - if (r < 0) { - log_error("Failed to parse reply: %s", strerror(-r)); - return r; - } + if (r < 0) + return bus_log_parse_error(r); r = sd_bus_get_property( bus, @@ -567,10 +611,8 @@ static int login_machine(sd_bus *bus, char **args, unsigned n) { } r = sd_bus_message_read(reply2, "u", &leader); - if (r < 0) { - log_error("Failed to parse reply: %s", strerror(-r)); - return r; - } + 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) { @@ -590,7 +632,7 @@ static int login_machine(sd_bus *bus, char **args, unsigned n) { return -EIO; } - r = sd_bus_open_system_container(args[1], &container_bus); + 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; @@ -617,6 +659,8 @@ static int login_machine(sd_bus *bus, char **args, unsigned n) { return r; } + container_bus = sd_bus_unref(container_bus); + assert_se(sigemptyset(&mask) == 0); sigset_add_many(&mask, SIGWINCH, SIGTERM, SIGINT, -1); assert_se(sigprocmask(SIG_BLOCK, &mask, NULL) == 0); @@ -643,7 +687,7 @@ static int help(void) { " -h --help Show this help\n" " --version Show package version\n" " --no-pager Do not pipe output into a pager\n" - " --no-ask-password Don't prompt for password\n" + " --no-legend Do not show the headers and footers\n" " -H --host=[USER@]HOST Operate on remote host\n" " -M --machine=CONTAINER Operate on local container\n" " -p --property=NAME Show only properties by this name\n" @@ -653,11 +697,13 @@ static int help(void) { " -s --signal=SIGNAL Which signal to send\n\n" "Commands:\n" " list List running VMs and containers\n" - " status [NAME...] Show VM/container status\n" - " show [NAME...] Show properties of one or more VMs/containers\n" - " terminate [NAME...] Terminate one or more VMs/containers\n" - " kill [NAME...] Send signal to processes of a VM/container\n" - " login [NAME] Get a login prompt on a container\n", + " status NAME... Show VM/container status\n" + " show NAME... Show properties of one or more VMs/containers\n" + " login NAME Get a login prompt on a container\n" + " poweroff NAME... Power off one or more containers\n" + " reboot NAME... Reboot one or more containers\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; @@ -668,8 +714,8 @@ static int parse_argv(int argc, char *argv[]) { enum { ARG_VERSION = 0x100, ARG_NO_PAGER, + ARG_NO_LEGEND, ARG_KILL_WHO, - ARG_NO_ASK_PASSWORD, }; static const struct option options[] = { @@ -679,11 +725,11 @@ static int parse_argv(int argc, char *argv[]) { { "all", no_argument, NULL, 'a' }, { "full", no_argument, NULL, 'l' }, { "no-pager", no_argument, NULL, ARG_NO_PAGER }, + { "no-legend", no_argument, NULL, ARG_NO_LEGEND }, { "kill-who", required_argument, NULL, ARG_KILL_WHO }, { "signal", required_argument, NULL, 's' }, { "host", required_argument, NULL, 'H' }, { "machine", required_argument, NULL, 'M' }, - { "no-ask-password", no_argument, NULL, ARG_NO_ASK_PASSWORD }, {} }; @@ -727,8 +773,8 @@ static int parse_argv(int argc, char *argv[]) { arg_no_pager = true; break; - case ARG_NO_ASK_PASSWORD: - arg_ask_password = false; + case ARG_NO_LEGEND: + arg_legend = false; break; case ARG_KILL_WHO: @@ -780,6 +826,8 @@ static int machinectl_main(sd_bus *bus, int argc, char *argv[]) { { "status", MORE, 2, show }, { "show", MORE, 1, show }, { "terminate", MORE, 2, terminate_machine }, + { "reboot", MORE, 2, reboot_machine }, + { "poweroff", MORE, 2, poweroff_machine }, { "kill", MORE, 2, kill_machine }, { "login", MORE, 2, login_machine }, };