From: Evgeni Golov <evgeni@golov.de>
Date: Thu, 2 Jun 2016 13:38:47 +0000 (+0200)
Subject: start containers in foreground when using the lxc@.service
X-Git-Tag: lxc-2.1.0~413^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1037%2Fhead;p=thirdparty%2Flxc.git

start containers in foreground when using the lxc@.service

lxc-start started to default to daemonize the container when starting
this conflicts with type=simple of the systemd unit

call lxc-start with -F and thus force execution in foreground
that way we can feed the log to journald properly and keep type=simple

Debian-Bug: https://bugs.debian.org/826100
Signed-off-by: Evgeni Golov <evgeni@golov.de>
---

diff --git a/config/init/systemd/lxc@.service.in b/config/init/systemd/lxc@.service.in
index 190280e6b..ba8cc1b44 100644
--- a/config/init/systemd/lxc@.service.in
+++ b/config/init/systemd/lxc@.service.in
@@ -9,7 +9,7 @@ Type=simple
 KillMode=mixed
 KillSignal=SIGPWR
 TimeoutStopSec=120s
-ExecStart=@BINDIR@/lxc-start -n %i
+ExecStart=@BINDIR@/lxc-start -F -n %i
 # Environment=BOOTUP=serial
 # Environment=CONSOLETYPE=serial
 Delegate=yes