2015-05-20 14:53:40 +00:00
|
|
|
From c1d39ccd066356ef5581081a97acfbe847103de7 Mon Sep 17 00:00:00 2001
|
2015-05-20 05:34:58 +00:00
|
|
|
From: Lennart Poettering <lennart@poettering.net>
|
|
|
|
Date: Tue, 19 May 2015 19:47:52 +0200
|
|
|
|
Subject: [PATCH] units: make sure systemd-nspawn@.slice instances are actually
|
|
|
|
located in machine.slice
|
|
|
|
|
|
|
|
https://plus.google.com/112206451048767236518/posts/SYAueyXHeEX
|
|
|
|
(cherry picked from commit 45d383a3b888195b01b58dbd2c46a11027ff5022)
|
|
|
|
---
|
|
|
|
units/systemd-nspawn@.service.in | 1 +
|
|
|
|
1 file changed, 1 insertion(+)
|
|
|
|
|
|
|
|
diff --git a/units/systemd-nspawn@.service.in b/units/systemd-nspawn@.service.in
|
|
|
|
index 3e26b53fd6..5e86121130 100644
|
|
|
|
--- a/units/systemd-nspawn@.service.in
|
|
|
|
+++ b/units/systemd-nspawn@.service.in
|
|
|
|
@@ -17,6 +17,7 @@ KillMode=mixed
|
|
|
|
Type=notify
|
|
|
|
RestartForceExitStatus=133
|
|
|
|
SuccessExitStatus=133
|
|
|
|
+Slice=machine.slice
|
|
|
|
Delegate=yes
|
|
|
|
|
|
|
|
[Install]
|