diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2011-05-06 11:03:46 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2011-05-06 11:03:46 +0000 |
| commit | 218d2e903132dd62617dbe51cc6b9577fe856e4a (patch) | |
| tree | a75449393d189ca4a1bf04b4be4c81a9fdfae3f7 /app-emulation/lxc | |
| parent | Cleaned DESCRIPTION (diff) | |
| download | historical-218d2e903132dd62617dbe51cc6b9577fe856e4a.tar.gz historical-218d2e903132dd62617dbe51cc6b9577fe856e4a.tar.bz2 historical-218d2e903132dd62617dbe51cc6b9577fe856e4a.zip | |
Reset the environment when starting the container so that its environment is picked up entirely.
Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64
Diffstat (limited to 'app-emulation/lxc')
| -rw-r--r-- | app-emulation/lxc/ChangeLog | 6 | ||||
| -rw-r--r-- | app-emulation/lxc/Manifest | 10 | ||||
| -rw-r--r-- | app-emulation/lxc/files/lxc.initd | 4 |
3 files changed, 12 insertions, 8 deletions
diff --git a/app-emulation/lxc/ChangeLog b/app-emulation/lxc/ChangeLog index 50dfe2f43d92..7a5b120bfbc8 100644 --- a/app-emulation/lxc/ChangeLog +++ b/app-emulation/lxc/ChangeLog @@ -1,6 +1,10 @@ # 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.22 2011/04/24 15:24:44 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/ChangeLog,v 1.23 2011/05/06 11:03:46 flameeyes Exp $ + + 06 May 2011; Diego E. Pettenò <flameeyes@gentoo.org> files/lxc.initd: + Reset the environment when starting the container so that its environment is + picked up entirely. *lxc-0.7.4.1-r1 (24 Apr 2011) diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest index 1c8ebb08c192..e0ce0d87254f 100644 --- a/app-emulation/lxc/Manifest +++ b/app-emulation/lxc/Manifest @@ -1,15 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX lxc.initd 3602 RMD160 9c1b3f16fb72f534c8c64b03e4dd4f4c5b05f800 SHA1 03827502cf7752ff6a2974cf2da598215aa60bfa SHA256 5029d19ee5f62032663065bb53a300faa7be3310929900ad7d19d0b85e69a30d +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 EBUILD lxc-0.7.4.1-r1.ebuild 3563 RMD160 0a26c85f5f145efc1c08617b3463da1467e02728 SHA1 84cc09e9ab4c08ffe41873497311d2aefaef38cd SHA256 892409e759499d46fa9607dddb92e3836f53d9ceb4e0fa664e66997c964543db -MISC ChangeLog 5293 RMD160 fbf999d7d926b09ab5218a12d9195d9799ed5014 SHA1 a5cf78d2f303862f970a4bb9a7f077173e57bb24 SHA256 619441c30a91f0faaafe39f46b94ba3930e9279482d2f44d3a9bd85b43fda5a0 +MISC ChangeLog 5468 RMD160 6b46273008b1489459d3dbbd1228172c6d535658 SHA1 16d8fce07bf2a3670afeb0cab99bb84d1d9e77ae SHA256 5ef00c09c3b7fb75ad8d8a56eba3736401399b7b1e76274d15e8e64bad32ddd2 MISC metadata.xml 653 RMD160 d6139a7ce3a5dab18f33c7f111f2e7827c290723 SHA1 47ba631625b4f2b20e491a964e65c78dd236f6f2 SHA256 35f64761067f47ff7abd0e3f3cb57f4bab888a2546bf3267d59987505101a190 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk20QLkACgkQAiZjviIA2XhXWgCg1tuxMMBpmo12hqplcrGYBibO -cLoAoMvUYpnGnyDtq9J2qIX2AQnIqH98 -=8xHn +iEYEARECAAYFAk3D1ZMACgkQAiZjviIA2Xg1KgCeNmtzDTVw7mXb1xBCpHLItAsj +tLQAoN6zOHAgrlOdSkQ1lUxGS1qbeLbt +=m6C5 -----END PGP SIGNATURE----- diff --git a/app-emulation/lxc/files/lxc.initd b/app-emulation/lxc/files/lxc.initd index 4388fb2304bf..6937901e4a81 100644 --- a/app-emulation/lxc/files/lxc.initd +++ b/app-emulation/lxc/files/lxc.initd @@ -1,7 +1,7 @@ #!/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.4 2011/04/24 15:24:44 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/files/lxc.initd,v 1.5 2011/05/06 11:03:46 flameeyes Exp $ CONTAINER=${SVCNAME#*.} CONFIGFILE=${CONFIGFILE:-/etc/lxc/${CONTAINER}.conf} @@ -93,7 +93,7 @@ start() { esac ebegin "Starting ${CONTAINER}" - ${setarch} 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 $(lxc_get_configfile) -d -o /var/log/lxc/${CONTAINER}.log sleep 0.5 # lxc-start -d will _always_ report a correct startup, even if it |