X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fmachine%2Fmachinectl.c;h=d812ef2600dcd08e30f344f1c5f5b17c6258336a;hb=03e334a1c7dc8c20c38902aa039440763acc9b17;hp=3f4f8acb7e2c861aed121cd98d5a480602b843cd;hpb=923d8fd381bced1c2d90ca53d18629d61a0f454a;p=elogind.git diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c index 3f4f8acb7..d812ef260 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,7 +103,8 @@ 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; } @@ -368,91 +370,42 @@ static int kill_machine(sd_bus *bus, char **args, unsigned n) { return 0; } -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; - - assert(args); +static int reboot_machine(sd_bus *bus, char **args, unsigned n) { + arg_kill_who = "leader"; + arg_signal = SIGINT; /* sysvinit + systemd */ - for (i = 1; i < n; i++) { - int r; + return kill_machine(bus, args, n); +} - r = sd_bus_call_method( - bus, - "org.freedesktop.machine1", - "/org/freedesktop/machine1", - "org.freedesktop.machine1.Manager", - "TerminateMachine", - &error, - NULL, - "s", args[i]); - if (r < 0) { - log_error("Could not terminate machine: %s", bus_error_message(&error, -r)); - return r; - } - } +static int poweroff_machine(sd_bus *bus, char **args, unsigned n) { + arg_kill_who = "leader"; + arg_signal = SIGRTMIN+4; /* only systemd */ - return 0; + return kill_machine(bus, args, n); } -static int reboot_machine(sd_bus *bus, char **args, unsigned 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; - int r; assert(args); - if (arg_transport != BUS_TRANSPORT_LOCAL) { - log_error("Reboot only supported on local machines."); - return -ENOTSUP; - } - for (i = 1; i < n; i++) { - _cleanup_bus_message_unref_ sd_bus_message *reply = NULL, *reply2 = NULL; - const char *path; - uint32_t leader; + int r; r = sd_bus_call_method( bus, "org.freedesktop.machine1", "/org/freedesktop/machine1", "org.freedesktop.machine1.Manager", - "GetMachine", + "TerminateMachine", &error, - &reply, + NULL, "s", args[i]); - - if (r < 0) { - log_error("Could not get path to machine: %s", bus_error_message(&error, -r)); - return r; - } - - r = sd_bus_message_read(reply, "o", &path); - if (r < 0) - return bus_log_parse_error(r); - - r = sd_bus_get_property( - bus, - "org.freedesktop.machine1", - path, - "org.freedesktop.machine1.Machine", - "Leader", - &error, - &reply2, - "u"); if (r < 0) { - log_error("Failed to retrieve PID of leader: %s", strerror(-r)); + log_error("Could not terminate machine: %s", bus_error_message(&error, -r)); return r; } - - r = sd_bus_message_read(reply2, "u", &leader); - if (r < 0) - return bus_log_parse_error(r); - - if (kill(leader, SIGINT) < 0) { - log_error("Failed to kill init process " PID_FMT ": %m", (pid_t) leader); - return -errno; - } } return 0; @@ -486,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) @@ -511,8 +463,7 @@ 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) { @@ -618,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; @@ -673,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" @@ -685,10 +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" - " kill NAME... Send signal to processes of a VM/container\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" - " login NAME Get a login prompt on a container\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; @@ -699,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[] = { @@ -710,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 }, {} }; @@ -758,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: @@ -812,6 +764,7 @@ static int machinectl_main(sd_bus *bus, int argc, char *argv[]) { { "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 }, };