nspawn: pass on kill signal setting to contaner scope
authorLennart Poettering <lennart@poettering.net>
Thu, 7 May 2015 21:37:32 +0000 (14:37 -0700)
committerLennart Poettering <lennart@poettering.net>
Mon, 11 May 2015 20:10:36 +0000 (22:10 +0200)
Let's just pass on what the user set for us.

src/nspawn/nspawn.c

index 05d2c71..2f7dd53 100644 (file)
@@ -2040,7 +2040,17 @@ static int register_machine(pid_t pid, int local_ifindex) {
                                           "/dev/pts/ptmx", "rw",
                                           "char-pts", "rw");
                 if (r < 0)
-                        return log_error_errno(r, "Failed to add device whitelist: %m");
+                        return bus_log_create_error(r);
+
+                if (arg_kill_signal != 0) {
+                        r = sd_bus_message_append(m, "(sv)", "KillSignal", "i", arg_kill_signal);
+                        if (r < 0)
+                                return bus_log_create_error(r);
+
+                        r = sd_bus_message_append(m, "(sv)", "KillMode", "s", "mixed");
+                        if (r < 0)
+                                return bus_log_create_error(r);
+                }
 
                 STRV_FOREACH(i, arg_property) {
                         r = sd_bus_message_open_container(m, 'r', "sv");