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;
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)
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;
bus,
"org.freedesktop.systemd1",
path,
- "org.freedesktop.systemd1.Scope",
+ endswith(unit, ".scope") ? "org.freedesktop.systemd1.Scope" : "org.freedesktop.systemd1.Service",
"ControlGroup",
&error,
&reply,
sd_id128_t id;
char *class;
char *service;
- char *scope;
+ char *unit;
char *root_directory;
pid_t leader;
usec_t timestamp;
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);
}
}
{ "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) },
free(info.name);
free(info.class);
free(info.service);
- free(info.scope);
+ free(info.unit);
free(info.root_directory);
return r;
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;
close_nointr_nofail(pair[1]);
pair[1] = -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;
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;
}
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;
}
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;
" -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"
" 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;
enum {
ARG_VERSION = 0x100,
ARG_NO_PAGER,
+ ARG_NO_LEGEND,
ARG_KILL_WHO,
- ARG_NO_ASK_PASSWORD,
};
static const struct option options[] = {
{ "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 },
{}
};
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:
{ "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 },
};