dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-07 16:41:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

nspawn: explicitly terminate machines when we exit nspawn

Browse Source 
https://bugs.freedesktop.org/show_bug.cgi?id=68370
https://bugzilla.redhat.com/show_bug.cgi?id=988883
This commit is contained in:
Lennart Poettering
2013-11-06 02:05:06 +01:00
parent d3e84ddb88
commit 1f0cd86b3d
1 changed files with 62 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/nspawn/nspawn.c
View File

@@ -33,8 +33,6 @@
#include <sys/prctl.h>
#include <sys/capability.h>
#include <getopt.h>
#include <sys/poll.h>
#include <sys/epoll.h>
#include <termios.h>
#include <sys/signalfd.h>
#include <grp.h>
@@ -43,9 +41,9 @@
#include <sys/socket.h>
#include <linux/netlink.h>
#include <systemd/sd-daemon.h>
#include <systemd/sd-bus.h>
#include "sd-daemon.h"
#include "sd-bus.h"
#include "sd-id128.h"
#include "log.h"
#include "util.h"
#include "mkdir.h"
@@ -56,12 +54,12 @@
#include "strv.h"
#include "path-util.h"
#include "loopback-setup.h"
#include "sd-id128.h"
#include "dev-setup.h"
#include "fdset.h"
#include "build.h"
#include "fileio.h"
#include "bus-util.h"
#include "bus-error.h"
#include "ptyfwd.h"
#ifndef TTY_GID
@@ -955,13 +953,67 @@ static int register_machine(void) {
strempty(arg_directory),
!isempty(arg_slice), "Slice", "s", arg_slice);
if (r < 0) {
log_error("Failed to register machine: %s", error.message ? error.message : strerror(-r));
log_error("Failed to register machine: %s", bus_error_message(&error, r));
return r;
}
return 0;
}
static int terminate_machine(pid_t pid) {
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
_cleanup_bus_unref_ sd_bus *bus = NULL;
const char *path;
int r;
r = sd_bus_open_system(&bus);
if (r < 0) {
log_error("Failed to open system bus: %s", strerror(-r));
return r;
}
r = sd_bus_call_method(
bus,
"org.freedesktop.machine1",
"/org/freedesktop/machine1",
"org.freedesktop.machine1.Manager",
"GetMachineByPID",
&error,
&reply,
"u",
(uint32_t) pid);
if (r < 0) {
/* Note that the machine might already have been
* cleaned up automatically, hence don't consider it a
* failure if we cannot get the machine object. */
log_debug("Failed to get machine: %s", bus_error_message(&error, r));
return 0;
}
r = sd_bus_message_read(reply, "o", &path);
if (r < 0) {
log_error("Failed to parse GetMachineByPID() reply: %s", bus_error_message(&error, r));
return r;
}
r = sd_bus_call_method(
bus,
"org.freedesktop.machine1",
path,
"org.freedesktop.machine1.Machine",
"Terminate",
&error,
NULL,
NULL);
if (r < 0) {
log_debug("Failed to terminate machine: %s", bus_error_message(&error, r));
return 0;
}
return 0;
}
static bool audit_enabled(void) {
int fd;
@@ -1391,6 +1443,9 @@ int main(int argc, char *argv[]) {
putc('\n', stdout);
/* Kill if it is not dead yet anyway */
terminate_machine(pid);
/* Redundant, but better safe than sorry */
kill(pid, SIGKILL);
k = wait_for_terminate(pid, &status);