X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fmachine%2Fmachinectl.c;h=912cffda1889d26e54ff77c0ee770774692f7191;hb=e56056e93d33619a3acf13e483900b4f8938228f;hp=703fb3a3a0e8ad869e80bab9a663deb7879fa945;hpb=89f7c8465cd1ab37347dd0c15920bce31e8225df;p=elogind.git

diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index 703fb3a3a..912cffda1 100644
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -46,6 +46,7 @@ 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;
@@ -84,7 +85,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 +104,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;
 }
@@ -395,6 +398,69 @@ static int terminate_machine(sd_bus *bus, char **args, unsigned n) {
         return 0;
 }
 
+static int reboot_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;
+
+                r = sd_bus_call_method(
+                                bus,
+                                "org.freedesktop.machine1",
+                                "/org/freedesktop/machine1",
+                                "org.freedesktop.machine1.Manager",
+                                "GetMachine",
+                                &error,
+                                &reply,
+                                "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));
+                        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;
+}
+
 static int openpt_in_namespace(pid_t pid, int flags) {
         _cleanup_close_pipe_ int pair[2] = { -1, -1 };
         _cleanup_close_ int pidnsfd = -1, mntnsfd = -1, rootfd = -1;
@@ -497,7 +563,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;
         }
 
@@ -610,6 +676,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-legend         Do not show the headers and footers\n"
                "     --no-ask-password   Don't prompt for password\n"
                "  -H --host=[USER@]HOST  Operate on remote host\n"
                "  -M --machine=CONTAINER Operate on local container\n"
@@ -624,6 +691,7 @@ static int help(void) {
                "  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"
+               "  reboot NAME...         Reboot one or more containers\n"
                "  login NAME             Get a login prompt on a container\n",
                program_invocation_short_name);
 
@@ -635,6 +703,7 @@ 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,
         };
@@ -646,6 +715,7 @@ 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'                 },
@@ -694,6 +764,10 @@ static int parse_argv(int argc, char *argv[]) {
                         arg_no_pager = true;
                         break;
 
+                case ARG_NO_LEGEND:
+                        arg_legend = false;
+                        break;
+
                 case ARG_NO_ASK_PASSWORD:
                         arg_ask_password = false;
                         break;
@@ -747,6 +821,7 @@ 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    },
                 { "kill",                  MORE,   2, kill_machine      },
                 { "login",                 MORE,   2, login_machine     },
         };