use forking mode for lxc@.service

diff --git a/debian/patches/series b/debian/patches/series
index 9150df05c422b7d25ad5856916fb829ff2483fa5..35ec4018c9b645da464fd1a66c7e5237c162521e 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 fix-systemd-service-depends.patch
 remove-systemd-delegate-flag.patch
+use-forking-systemd-service.patch
 run-lxcnetaddbr.patch
 deny-rw-mounting-of-sys-and-proc.patch
 0001-separate-the-limiting-from-the-namespaced-cgroup-roo.patch

diff --git a/debian/patches/use-forking-systemd-service.patch b/debian/patches/use-forking-systemd-service.patch
new file mode 100644 (file)
index 0000000..881c842
--- /dev/null
+++ b/debian/patches/use-forking-systemd-service.patch
@@ -0,0 +1,34 @@
+From ba028c2a3f73eec5e45842cc742a20471ee0d921 Mon Sep 17 00:00:00 2001
+From: Wolfgang Bumiller <w.bumiller@proxmox.com>
+Date: Thu, 2 Feb 2017 11:15:22 +0100
+Subject: [PATCH] init: systemd: use forking mode in lxc@.service
+
+To avoid dumping the entire console outputs into the
+logs
+
+Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
+---
+ config/init/systemd/lxc@.service.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/config/init/systemd/lxc@.service.in b/config/init/systemd/lxc@.service.in
+index 44d11e8..52c6a27 100644
+--- a/config/init/systemd/lxc@.service.in
++++ b/config/init/systemd/lxc@.service.in
+@@ -6,11 +6,11 @@ Wants=lxc.service
+ Documentation=man:lxc-start man:lxc
+ 
+ [Service]
+-Type=simple
++Type=forking
+ KillMode=mixed
+ KillSignal=SIGPWR
+ TimeoutStopSec=120s
+-ExecStart=@BINDIR@/lxc-start -F -n %i
++ExecStart=@BINDIR@/lxc-start -n %i
+ # Environment=BOOTUP=serial
+ # Environment=CONSOLETYPE=serial
+ Delegate=yes
+-- 
+2.1.4
+