hwoarang 15/04/23 16:31:44 Modified: lxc.initd.3 Log: Version bump. Bug #546232. Fix lxc path in the openrc init script. Bug #547266 (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 09BF4F54C2BA7F3C!)
Revision Changes Path 1.2 app-emulation/lxc/files/lxc.initd.3 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/lxc/files/lxc.initd.3?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/lxc/files/lxc.initd.3?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/lxc/files/lxc.initd.3?r1=1.1&r2=1.2 Index: lxc.initd.3 =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/lxc/files/lxc.initd.3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- lxc.initd.3 18 Oct 2014 17:00:37 -0000 1.1 +++ lxc.initd.3 23 Apr 2015 16:31:44 -0000 1.2 @@ -1,15 +1,17 @@ #!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/files/lxc.initd.3,v 1.1 2014/10/18 17:00:37 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/files/lxc.initd.3,v 1.2 2015/04/23 16:31:44 hwoarang Exp $ CONTAINER=${SVCNAME#*.} +LXC_PATH="/var/lib" + lxc_get_configfile() { - if [ -f "/etc/lxc/${CONTAINER}.conf" ]; then - echo "/etc/lxc/${CONTAINER}.conf" - elif [ -f "/etc/lxc/${CONTAINER}/config" ]; then - echo "/etc/lxc/${CONTAINER}/config" + if [ -f "${LXC_PATH}/${CONTAINER}.conf" ]; then + echo "${LXC_PATH}/${CONTAINER}.conf" + elif [ -f "${LXC_PATH}/${CONTAINER}/config" ]; then + echo "${LXC_PATH}/${CONTAINER}/config" else eerror "Unable to find a suitable configuration file." eerror "If you set up the container in a non-standard"
