chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
man: fix a typo
[elogind.git] / src / machine / machinectl.c
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index f5485b3d4209c4ba24b6ab264814a63b664f13ea..3f4f8acb7e2c861aed121cd98d5a480602b843cd 100644 (file)
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -107,7 +107,7 @@ static int list_machines(sd_bus *bus, char **args, unsigned n) {
         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 +129,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 +168,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 +219,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 +231,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 +264,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;
@@ -304,10 +304,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++) {
@@ -397,9 +395,72 @@ 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 nsfd = -1, rootfd = -1;
+        _cleanup_close_ int pidnsfd = -1, mntnsfd = -1, rootfd = -1;
         union {
                 struct cmsghdr cmsghdr;
                 uint8_t buf[CMSG_SPACE(sizeof(int))];
@@ -413,7 +474,7 @@ static int openpt_in_namespace(pid_t pid, int flags) {
         pid_t child;
         siginfo_t si;
 
-        r = namespace_open(pid, &nsfd, &rootfd);
+        r = namespace_open(pid, &pidnsfd, &mntnsfd, &rootfd);
         if (r < 0)
                 return r;
 
@@ -428,7 +489,7 @@ static int openpt_in_namespace(pid_t pid, int flags) {
                 close_nointr_nofail(pair[0]);
                 pair[0] = -1;
 
-                r = namespace_enter(nsfd, rootfd);
+                r = namespace_enter(pidnsfd, mntnsfd, rootfd);
                 if (r < 0)
                         _exit(EXIT_FAILURE);
 
@@ -453,6 +514,12 @@ static int openpt_in_namespace(pid_t pid, int flags) {
         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;
 
@@ -472,14 +539,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;
 }
@@ -499,7 +560,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;
         }
 
@@ -626,6 +687,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);
 
@@ -749,6 +811,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     },
         };
Unnamed repository; edit this file 'description' to name the repository.