# ChangeLog for app-emulation/lxc
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/ChangeLog,v 1.25 2011/07/26 13:39:28 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/ChangeLog,v 1.26 2011/09/05 18:32:44 flameeyes Exp $
+
+*lxc-0.7.5 (05 Sep 2011)
+
+ 05 Sep 2011; Diego E. Pettenò <flameeyes@gentoo.org> -lxc-0.7.4.1-r1.ebuild,
+ +lxc-0.7.5.ebuild, files/lxc.initd:
+ Version bump; also includes fixes for the init script, closing bugs #379679
+ and #379683 by George Georgiev.
*lxc-0.7.4.2 (26 Jul 2011)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX lxc.initd 3620 RMD160 4c594655927fbd3438dcea2e2d77cca8874f0f10 SHA1 800f2ce6ff3e9c65ffc16763020275991e8229f2 SHA256 497760658fea3b82562e6eaf2fe540351d5252b9d752b56fd944ba5514f9bb83
-DIST lxc-0.7.4.1.tar.gz 274420 RMD160 1028abd9ae0f2689ac9cd15f33f9dc0b2aa0a8fb SHA1 837be69ef9fa20441793bb97b6d1291dba9191c2 SHA256 6354e7c0ada65bcd1649d4a8333adde97e6480da518399ad2298a7364ef7881f
+AUX lxc.initd 3525 RMD160 aa9c9e3864cdad8760b1fac4fa222a4def0bacba SHA1 2a28c4d5fae0f1ee67cbe19403a71faacf49ef12 SHA256 ed3fcb2fb8eb124a7b7a939a720ab08d62429f0cc97f169ede4828ee67984aa4
DIST lxc-0.7.4.2.tar.gz 274421 RMD160 4f56aab0bbb48a514fee7fece9a485e599688a63 SHA1 876cf9a4788eb082e58e4a7853ca81b0a9676037 SHA256 b483fcc1c1a2540c194af065d9c68aeab261b57bd4d50b17f3970701a322a0b3
-EBUILD lxc-0.7.4.1-r1.ebuild 3568 RMD160 dba0f4d59fd3b6e835fd18ee721675f5bbac56db SHA1 7ad2aefaabf0244c1945bfa80130d8a0ef0dcdea SHA256 46d92705f1f8dc5dd987b6a708fada36e9111e182dbe96293ca9a81cb7f14c20
+DIST lxc-0.7.5.tar.gz 265562 RMD160 93407be1ebf31bdcfa617e60672d9f86ba2940d1 SHA1 9712dccdcd2c10a522134fa17384a5b9e38fce0e SHA256 019ec63f250c874bf7625b1f1bf555b1a6e3a947937a4fca73100abddf829b1c
EBUILD lxc-0.7.4.2.ebuild 3528 RMD160 c3103d7e1e15d42f33313536eeffc7490d93f1a4 SHA1 279fc085f333a5f760f17eedc98bafdd428ce73f SHA256 a4c9350fb82fc9870231a0c97245a80023e701f253ddd97122cd6b0f03dcbb29
-MISC ChangeLog 5676 RMD160 8e28a73bb7d3a4815a4ad0230a16f3b05dd93d38 SHA1 5e01e0731c15397a56164bbfdc899df81398a2be SHA256 8a5651988af9242b699e37099edc7ca28bc8c76dc1e4b219d6223d820a3979a5
+EBUILD lxc-0.7.5.ebuild 3203 RMD160 eeabd1bd57809b17ccab5e6b2aa9a143da2fade1 SHA1 483823a628a0dfde3ae078c43b1b6f3afe0aa9e3 SHA256 35364f5d85c8efdc6adb551727b4f72fdb9a3b0b2700a096b8dda638fb816daa
+MISC ChangeLog 5933 RMD160 2bd4ac5f26caec5df62c8272aadef241b973c06f SHA1 aad583e1c64e76f8d09bfca47efa1e796686161a SHA256 8327c19918513ee08f3c4f3f9696122738fdf8dcba86c74668f9301ceab56df0
MISC metadata.xml 653 RMD160 d6139a7ce3a5dab18f33c7f111f2e7827c290723 SHA1 47ba631625b4f2b20e491a964e65c78dd236f6f2 SHA256 35f64761067f47ff7abd0e3f3cb57f4bab888a2546bf3267d59987505101a190
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
-iEYEARECAAYFAk4uw5oACgkQAiZjviIA2Xi00QCg6tzUfma9aLiYH1jWxFbHH3Pz
-DIIAn2+mH/H0HzZf5y5BZVXvo9VY15z9
-=oB4M
+iEYEARECAAYFAk5lFa4ACgkQAiZjviIA2XiBbQCg0wslq3FeOe2FquZEe3Qv7hSH
+Zo8AnAioOcCZUtTVehU0sqHsdINrS0vk
+=n84L
-----END PGP SIGNATURE-----
#!/sbin/runscript
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/files/lxc.initd,v 1.5 2011/05/06 11:03:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/files/lxc.initd,v 1.6 2011/09/05 18:32:44 flameeyes Exp $
CONTAINER=${SVCNAME#*.}
-CONFIGFILE=${CONFIGFILE:-/etc/lxc/${CONTAINER}.conf}
lxc_get_configfile() {
- if [ -n "${CONFIGFILE}" ]; then
- echo "${CONFIGFILE}"
- elif [ -f "/etc/lxc/${CONTAINER}.conf" ]; then
+ if [ -f "/etc/lxc/${CONTAINER}.conf" ]; then
echo "/etc/lxc/${CONTAINER}.conf"
elif [ -f "/etc/lxc/${CONTAINER}/config" ]; then
echo "/etc/lxc/${CONTAINER}/config"
fi
}
+CONFIGFILE=${CONFIGFILE:-$(lxc_get_configfile)}
+
lxc_get_var() {
- awk 'BEGIN { FS="[ \t]*=[ \t]*" } $1 == "'$1'" { print $2; exit }' $(lxc_get_configfile)
+ awk 'BEGIN { FS="[ \t]*=[ \t]*" } $1 == "'$1'" { print $2; exit }' ${CONFIGFILE}
}
cgroup_get_mount() {
fi
# no need to output anything, the function takes care of that.
- [ -z "$(lxc_get_configfile)" ] && return 1
+ [ -z "${CONFIGFILE}" ] && return 1
utsname=$(lxc_get_var lxc.utsname)
if [ ${CONTAINER} != ${utsname} ]; then
# non-muxed init script, unfortunately.
checkconfig 2>/dev/null || return 0
- config $(lxc_get_configfile)
+ config ${CONFIGFILE}
need localmount
# find out which network interface the container is linked to,
# and then require that to be enabled, so that the
# dependencies are correct.
netif=$(lxc_get_var lxc.network.link)
- [ -n "${netif}" ] && need net.${netif}
+ [ -n "${netif}" ] && use net.${netif}
}
start() {
esac
ebegin "Starting ${CONTAINER}"
- env -i ${setarch} $(type -p lxc-start) -l WARN -n ${CONTAINER} -f $(lxc_get_configfile) -d -o /var/log/lxc/${CONTAINER}.log
+ env -i ${setarch} $(type -p lxc-start) -l WARN -n ${CONTAINER} -f ${CONFIGFILE} -d -o /var/log/lxc/${CONTAINER}.log
sleep 0.5
# lxc-start -d will _always_ report a correct startup, even if it
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-0.7.4.1-r1.ebuild,v 1.2 2011/07/05 02:46:37 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-0.7.5.ebuild,v 1.1 2011/09/05 18:32:44 flameeyes Exp $
-EAPI="2"
+EAPI="4"
MY_P="${P/_/-}"
-inherit eutils linux-info versionator base
+inherit eutils linux-info versionator flag-o-matic
DESCRIPTION="LinuX Containers userspace utilities"
HOMEPAGE="http://lxc.sourceforge.net/"
LICENSE="LGPL-3"
SLOT="0"
-IUSE="doc examples vanilla"
+IUSE="examples vanilla"
RDEPEND="sys-libs/libcap"
DEPEND="${RDEPEND}
- doc? ( app-text/docbook-sgml-utils )
+ app-text/docbook-sgml-utils
>=sys-kernel/linux-headers-2.6.29"
# For init script, so protect with vanilla, they are not strictly
)"
CONFIG_CHECK="~CGROUPS
- ~CGROUP_NS ~CPUSETS ~CGROUP_CPUACCT
+ ~CPUSETS ~CGROUP_CPUACCT
~RESOURCE_COUNTERS ~CGROUP_MEM_RES_CTLR
~CGROUP_SCHED
ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking"
ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) networking"
+DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS TODO README doc/FAQ.txt)
+
src_configure() {
+ append-flags -fno-strict-aliasing
+
econf \
--localstatedir=/var \
--bindir=/usr/sbin \
--with-config-path=/etc/lxc \
--with-rootfs-path=/usr/lib/lxc/rootfs \
--with-linuxdir="${KERNEL_DIR}" \
- $(use_enable doc) \
- $(use_enable examples) \
- || die "configure failed"
+ --enable-doc \
+ $(use_enable examples)
}
src_install() {
- emake DESTDIR="${D}" install || die "install failed"
-
- dodoc AUTHORS CONTRIBUTING MAINTAINERS \
- NEWS TODO README doc/FAQ.txt || die "dodoc failed"
-
- # If the documentation is going to be rebuilt, the Makefiles will
- # install the man pages themselves; if we're not going to, we
- # still need to install them, as they are provided with the
- # tarball in recent versions.
- if ! use doc; then
- doman doc/*.{1,5,7} || die
- fi
+ default
rm -r "${D}"/usr/sbin/lxc-{setcap,ls} \
"${D}"/usr/share/man/man1/lxc-ls.1 \
projects / gentoo.git / commitdiff