X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fmachine%2Fmachinectl.c;h=6337aa274fd5ada55986abecc00e3b053e43fb9a;hp=a2af87c17d2ccea40f9e76cab6375e7978a52d25;hb=3d94f76c99da13e5603831d0b278f8c8c21bcb02;hpb=8c841f21f5042b11acc91cc1b039cb162cbbe8f4 diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c index a2af87c17..6337aa274 100644 --- a/src/machine/machinectl.c +++ b/src/machine/machinectl.c @@ -46,9 +46,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,7 +84,8 @@ static int list_machines(sd_bus *bus, char **args, unsigned n) { return r; } - printf("%-32s %-9s %-16s\n", "MACHINE", "CONTAINER", "SERVICE"); + 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) @@ -102,12 +103,13 @@ static int list_machines(sd_bus *bus, char **args, unsigned n) { if (r < 0) return bus_log_parse_error(r); - printf("\n%u machines listed.\n", k); + if (arg_legend) + printf("\n%u machines listed.\n", k); return 0; } -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; @@ -129,7 +131,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, @@ -168,7 +170,7 @@ typedef struct MachineStatusInfo { sd_id128_t id; char *class; char *service; - char *scope; + char *unit; char *root_directory; pid_t leader; usec_t timestamp; @@ -219,9 +221,9 @@ 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); + if (i->unit) { + printf("\t Unit: %s\n", i->unit); + show_unit_cgroup(bus, i->unit, i->leader); } } @@ -231,7 +233,7 @@ static int show_info(const char *verb, sd_bus *bus, const char *path, bool *new_ { "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) }, @@ -264,7 +266,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; @@ -368,6 +370,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; @@ -396,7 +412,7 @@ static int terminate_machine(sd_bus *bus, char **args, unsigned n) { } static int openpt_in_namespace(pid_t pid, int flags) { - _cleanup_close_pipe_ int pair[2] = { -1, -1 }; + _cleanup_close_pair_ int pair[2] = { -1, -1 }; _cleanup_close_ int pidnsfd = -1, mntnsfd = -1, rootfd = -1; union { struct cmsghdr cmsghdr; @@ -423,8 +439,7 @@ static int openpt_in_namespace(pid_t pid, int flags) { return -errno; if (child == 0) { - close_nointr_nofail(pair[0]); - pair[0] = -1; + pair[0] = safe_close(pair[0]); r = namespace_enter(pidnsfd, mntnsfd, rootfd); if (r < 0) @@ -448,8 +463,13 @@ static int openpt_in_namespace(pid_t pid, int flags) { _exit(EXIT_SUCCESS); } - close_nointr_nofail(pair[1]); - pair[1] = -1; + pair[1] = safe_close(pair[1]); + + r = wait_for_terminate(child, &si); + if (r < 0 || si.si_code != CLD_EXITED || si.si_status != EXIT_SUCCESS) { + + return r < 0 ? r : -EIO; + } if (recvmsg(pair[0], &mh, MSG_NOSIGNAL|MSG_CMSG_CLOEXEC) < 0) return -errno; @@ -470,14 +490,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; } @@ -497,7 +511,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; } @@ -555,7 +569,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; @@ -610,7 +624,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" @@ -622,9 +636,11 @@ static int help(void) { " 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" + " 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" - " login NAME Get a login prompt on a container\n", + " terminate NAME... Terminate one or more VMs/containers\n", program_invocation_short_name); return 0; @@ -635,8 +651,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[] = { @@ -646,11 +662,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 }, {} }; @@ -694,8 +710,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: @@ -747,6 +763,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 }, };