systemctl: Implement --wait for kill command

NEWS

@@ -258,6 +258,9 @@ CHANGES WITH 256-rc1:
           that configures what to do after the system manager (PID 1) crashes.
           This can also be configured through CrashAction= in systemd.conf.
 
+        * "systemctl kill" now supports --wait which will make the command wait
+          until the signalled services terminate.
+
         Journal:
 
         * systemd-journald can now forward journal entries to a socket

man/systemctl.xml

@@ -2377,14 +2377,16 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err
         <term><option>--wait</option></term>
 
         <listitem>
-          <para>Synchronously wait for started units to terminate again.
-          This option may not be combined with <option>--no-block</option>.
-          Note that this will wait forever if any given unit never terminates
-          (by itself or by getting stopped explicitly); particularly services
-          which use <literal>RemainAfterExit=yes</literal>.</para>
-
-          <para>When used with <command>is-system-running</command>, wait
-          until the boot process is completed before returning.</para>
+          <para>When used with <command>start</command> or <command>restart</command>, synchronously wait for
+          started units to terminate again. This option may not be combined with <option>--no-block</option>.
+          Note that this will wait forever if any given unit never terminates (by itself or by getting
+          stopped explicitly); particularly services which use <literal>RemainAfterExit=yes</literal>.</para>
+
+          <para>When used with <command>is-system-running</command>, wait until the boot process is completed
+          before returning.</para>
+
+          <para>When used with <command>kill</command>, wait until the signalled units terminate. Note that
+          this will wait forever if any given unit never terminates.</para>
 
           <xi:include href="version-info.xml" xpointer="v232"/>
         </listitem>

src/systemctl/systemctl-kill.c

@@ -2,11 +2,13 @@
 
 #include "bus-error.h"
 #include "bus-locator.h"
+#include "bus-wait-for-units.h"
 #include "systemctl-kill.h"
 #include "systemctl-util.h"
 #include "systemctl.h"
 
 int verb_kill(int argc, char *argv[], void *userdata) {
+        _cleanup_(bus_wait_for_units_freep) BusWaitForUnits *w = NULL;
         _cleanup_strv_free_ char **names = NULL;
         const char *kill_whom;
         sd_bus *bus;
@@ -16,6 +18,12 @@ int verb_kill(int argc, char *argv[], void *userdata) {
         if (r < 0)
                 return r;
 
+        if (arg_wait) {
+                r = bus_wait_for_units_new(bus, &w);
+                if (r < 0)
+                        return log_error_errno(r, "Failed to allocate unit watch context: %m");
+        }
+
         polkit_agent_open_maybe();
 
         kill_whom = arg_kill_whom ?: "all";
@@ -48,11 +56,24 @@ int verb_kill(int argc, char *argv[], void *userdata) {
                                         NULL,
                                         "ssi", *name, kill_whom, arg_signal);
                 if (q < 0) {
-                        log_error_errno(q, "Failed to kill unit %s: %s", *name, bus_error_message(&error, q));
-                        if (r == 0)
-                                r = q;
+                        RET_GATHER(r, log_error_errno(q, "Failed to kill unit %s: %s", *name, bus_error_message(&error, q)));
+                        continue;
+                }
+
+                if (w) {
+                        q = bus_wait_for_units_add_unit(w, *name, BUS_WAIT_FOR_INACTIVE|BUS_WAIT_NO_JOB, NULL, NULL);
+                        if (q < 0)
+                                RET_GATHER(r, log_error_errno(q, "Failed to watch unit %s: %m", *name));
                 }
         }
 
+        if (w) {
+                q = bus_wait_for_units_run(w);
+                if (q < 0)
+                        return log_error_errno(q, "Failed to wait for units: %m");
+                if (q == BUS_WAIT_FAILURE)
+                        RET_GATHER(r, -EIO);
+        }
+
         return r;
 }

src/systemctl/systemctl.c

@@ -305,6 +305,7 @@ static int systemctl_help(void) {
                "     --no-warn           Suppress several warnings shown by default\n"
                "     --wait              For (re)start, wait until service stopped again\n"
                "                         For is-system-running, wait until startup is completed\n"
+               "                         For kill, wait until service stopped\n"
                "     --no-block          Do not wait until operation finished\n"
                "     --no-wall           Don't send wall message before halt/power-off/reboot\n"
                "     --message=MESSAGE   Specify human readable reason for system shutdown\n"

test/units/testsuite-26.sh

@@ -147,7 +147,7 @@ systemctl reload -T "$UNIT_NAME"
 systemctl restart -T "$UNIT_NAME"
 systemctl try-restart --show-transaction "$UNIT_NAME"
 systemctl try-reload-or-restart --show-transaction "$UNIT_NAME"
-systemctl kill "$UNIT_NAME"
+timeout 10 systemctl kill --wait "$UNIT_NAME"
 (! systemctl is-active "$UNIT_NAME")
 systemctl restart "$UNIT_NAME"
 systemctl is-active "$UNIT_NAME"