From: Robert Vogelgesang <vogel@users.sourceforge.net>
Date: Fri, 4 Apr 2014 17:04:03 +0000 (+0200)
Subject: Move lxc-monitord.log out of /var/lib/lxc/
X-Git-Tag: lxc-1.1.0.alpha1~166
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a7f2dcdb8498726a9054e1ef5b9dcf6f2339fbd;p=thirdparty%2Flxc.git

Move lxc-monitord.log out of /var/lib/lxc/

Place log file into LOGPATH instead of LXCPATH (but still use the
given lxcpath if the latter differs from LXCPATH).

Signed-off-by: Robert Vogelgesang <vogel@users.sourceforge.net>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/src/lxc/lxc_monitord.c b/src/lxc/lxc_monitord.c
index 8f7e6b0a2..6328bf845 100644
--- a/src/lxc/lxc_monitord.c
+++ b/src/lxc/lxc_monitord.c
@@ -360,7 +360,7 @@ int main(int argc, char *argv[])
 	}
 
 	ret = snprintf(logpath, sizeof(logpath), "%s/lxc-monitord.log",
-		       lxcpath);
+		       (strcmp(LXCPATH, lxcpath) ? lxcpath : LOGPATH ) );
 	if (ret < 0 || ret >= sizeof(logpath))
 		return EXIT_FAILURE;