Gentoo Archives: gentoo-commits

From: "Diego Petteno (flameeyes)" <flameeyes@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/lxc/files: lxc.initd
Date: Fri, 06 May 2011 11:03:56
Message-Id: 20110506110346.E186620054@flycatcher.gentoo.org
1 flameeyes 11/05/06 11:03:46
2
3 Modified: lxc.initd
4 Log:
5 Reset the environment when starting the container so that its environment is picked up entirely.
6
7 (Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.5 app-emulation/lxc/files/lxc.initd
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/lxc/files/lxc.initd?rev=1.5&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/lxc/files/lxc.initd?rev=1.5&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/lxc/files/lxc.initd?r1=1.4&r2=1.5
15
16 Index: lxc.initd
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-emulation/lxc/files/lxc.initd,v
19 retrieving revision 1.4
20 retrieving revision 1.5
21 diff -u -r1.4 -r1.5
22 --- lxc.initd 24 Apr 2011 15:24:44 -0000 1.4
23 +++ lxc.initd 6 May 2011 11:03:46 -0000 1.5
24 @@ -1,7 +1,7 @@
25 #!/sbin/runscript
26 # Copyright 1999-2011 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/files/lxc.initd,v 1.4 2011/04/24 15:24:44 flameeyes Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/files/lxc.initd,v 1.5 2011/05/06 11:03:46 flameeyes Exp $
30
31 CONTAINER=${SVCNAME#*.}
32 CONFIGFILE=${CONFIGFILE:-/etc/lxc/${CONTAINER}.conf}
33 @@ -93,7 +93,7 @@
34 esac
35
36 ebegin "Starting ${CONTAINER}"
37 - ${setarch} lxc-start -l WARN -n ${CONTAINER} -f $(lxc_get_configfile) -d -o /var/log/lxc/${CONTAINER}.log
38 + env -i ${setarch} $(type -p lxc-start) -l WARN -n ${CONTAINER} -f $(lxc_get_configfile) -d -o /var/log/lxc/${CONTAINER}.log
39 sleep 0.5
40
41 # lxc-start -d will _always_ report a correct startup, even if it