Add a fix for baselayout-2 support within vservers, we explicitly need to export TERM=linux in init-vserver.sh to get color with baselayout-2.

Package-Manager: portage-2.1.2.7

4 files changed, 61 insertions, 10 deletions

diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index 40ddf96c90fa..d5e75b485464 100644
--- a/sys-cluster/util-vserver/ChangeLog
+++ b/sys-cluster/util-vserver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/util-vserver
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.80 2007/05/03 20:23:12 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.81 2007/05/16 09:50:50 phreak Exp $
+
+  16 May 2007; Christian Heim <phreak@gentoo.org>
+  +files/util-vserver-0.30.213-init-vserver.sh.patch,
+  util-vserver-0.30.213.ebuild:
+  Add a fix for baselayout-2 support within vservers, we explicitly need to
+  export TERM=linux in init-vserver.sh to get color with baselayout-2.
 
 *util-vserver-0.30.213 (03 May 2007)
 
diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
index cb9fe65244cf..5f05ca6b59b7 100644
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX bash_completion 7568 RMD160 45feafa30f715fb287403518eee8c45fecfe418e SHA1 d281bcad111df21ab0f37703142dd102145d784e SHA256 2232166a5aed9857a7a5c30adfdd4ea944e0608a29fad05f229b8cef2d61795d
 MD5 20d9b2d8c50fe0ca9bb381d16daf2d7d files/bash_completion 7568
 RMD160 45feafa30f715fb287403518eee8c45fecfe418e files/bash_completion 7568
@@ -22,20 +25,24 @@ AUX util-vserver-0.30.212-wrapper.patch 1349 RMD160 f8c4bfd740846c43e56a97db8630
 MD5 bc15d959f59fbe0250e0be2f2ca9ee70 files/util-vserver-0.30.212-wrapper.patch 1349
 RMD160 f8c4bfd740846c43e56a97db86302e81b8afa1c8 files/util-vserver-0.30.212-wrapper.patch 1349
 SHA256 548b9732f12492f1ca58d72c3fd8634c99047d1619c19a1c9407a6864150c3fe files/util-vserver-0.30.212-wrapper.patch 1349
+AUX util-vserver-0.30.213-init-vserver.sh.patch 410 RMD160 db40ca3cff302c8618f3dd1387f21930c2c88ebe SHA1 c21ccb89e96e360c489a9741758a4a12d759102f SHA256 af93aaa4a1bcf36ac01c600663fe463e01bcbf777c512fee020d965a975924f7
+MD5 ae9ac693a9b02024baa2a59d641d45e7 files/util-vserver-0.30.213-init-vserver.sh.patch 410
+RMD160 db40ca3cff302c8618f3dd1387f21930c2c88ebe files/util-vserver-0.30.213-init-vserver.sh.patch 410
+SHA256 af93aaa4a1bcf36ac01c600663fe463e01bcbf777c512fee020d965a975924f7 files/util-vserver-0.30.213-init-vserver.sh.patch 410
 DIST util-vserver-0.30.212.tar.bz2 643139 RMD160 e0bb7600204c99bf2192332b2fb5680cd647d226 SHA1 366e9aa56490de71dccebf7ee99a81e37a274267 SHA256 dad182f0c882f32d96cab8d9065e4417d9c2f8146e1e2c9f197580389cc4a484
 DIST util-vserver-0.30.213.tar.bz2 661444 RMD160 0e526dd037d86b260b136a5ac1a0d280754aa5ea SHA1 8e84088cb9ccf2e0812134f2712a1233447e3754 SHA256 16fbfcc3dd706431682102bb69fc5663c6917a079aca734459717889a97d5bb7
 EBUILD util-vserver-0.30.212-r2.ebuild 3825 RMD160 55abe18531b899dd143610f67baa9f4f36bea357 SHA1 1d633e3b7b51f9be305166cf7333633399a5b7c0 SHA256 f135b163663292611ec8f7b0448833bbfa38d279a784ea3c92715e0642c79e12
 MD5 b84dbc71e5351f8fc93d233aa67f3d1a util-vserver-0.30.212-r2.ebuild 3825
 RMD160 55abe18531b899dd143610f67baa9f4f36bea357 util-vserver-0.30.212-r2.ebuild 3825
 SHA256 f135b163663292611ec8f7b0448833bbfa38d279a784ea3c92715e0642c79e12 util-vserver-0.30.212-r2.ebuild 3825
-EBUILD util-vserver-0.30.213.ebuild 3352 RMD160 090d861edd1f62cb10aa2876084943299124d00e SHA1 187044e103b27000b3f77949ae85405c5213bffa SHA256 9fd42eefff9b264624a24685284155b6fa19d17476e746d751173eb9a6e95c70
-MD5 4ac622f6c7a67f6c2e9dae3faecd0cbc util-vserver-0.30.213.ebuild 3352
-RMD160 090d861edd1f62cb10aa2876084943299124d00e util-vserver-0.30.213.ebuild 3352
-SHA256 9fd42eefff9b264624a24685284155b6fa19d17476e746d751173eb9a6e95c70 util-vserver-0.30.213.ebuild 3352
-MISC ChangeLog 16425 RMD160 8180207b97593aee22dd1054d94463c202812982 SHA1 c7f555fb95f7e76c7848abcb79344ea1ca3028db SHA256 60248a40c9657635a6d4ff7aa1ad8b7f2c1fc57daf2719bb5f6ebd9c131d61a6
-MD5 0af593a4f104673d82c5c951d3c4a7f0 ChangeLog 16425
-RMD160 8180207b97593aee22dd1054d94463c202812982 ChangeLog 16425
-SHA256 60248a40c9657635a6d4ff7aa1ad8b7f2c1fc57daf2719bb5f6ebd9c131d61a6 ChangeLog 16425
+EBUILD util-vserver-0.30.213.ebuild 3654 RMD160 edf5323bc609b625b010f136482ac6f6c1173eaa SHA1 671b2d22a680f7aa183cbc0b07394dc3f60b6a08 SHA256 2d2c857ad14bfa7d793dce658ed288f7bdec3d30bddd727a0a2c7cd3eefb13e5
+MD5 7b2944c0737f7806ce54b1daa02d42ea util-vserver-0.30.213.ebuild 3654
+RMD160 edf5323bc609b625b010f136482ac6f6c1173eaa util-vserver-0.30.213.ebuild 3654
+SHA256 2d2c857ad14bfa7d793dce658ed288f7bdec3d30bddd727a0a2c7cd3eefb13e5 util-vserver-0.30.213.ebuild 3654
+MISC ChangeLog 16709 RMD160 a297dbe6022bbb85dfb91ac7d88be0a72880d7b1 SHA1 ecc441e05f046674096c8e152967467bc73cdca2 SHA256 eb8d246d8c07b9e337f2c4c4e70e423cb9e1b7a29ba1f2951e1ce507c632b69d
+MD5 7c90ca6d4127e17050f7f7a5f8bf75fa ChangeLog 16709
+RMD160 a297dbe6022bbb85dfb91ac7d88be0a72880d7b1 ChangeLog 16709
+SHA256 eb8d246d8c07b9e337f2c4c4e70e423cb9e1b7a29ba1f2951e1ce507c632b69d ChangeLog 16709
 MISC metadata.xml 588 RMD160 43bd819942f6f0c03bec0bcf67601a7099b59a2b SHA1 d0e5af40193886066bbe1060324dede1f0fd367f SHA256 798e87b6d5fb379322178e9f8b7432371f630caaf3fd6ff369e35056483cc31d
 MD5 493021fa14e20216e8ce772e9dc10a62 metadata.xml 588
 RMD160 43bd819942f6f0c03bec0bcf67601a7099b59a2b metadata.xml 588
@@ -46,3 +53,10 @@ SHA256 d85b209f085a57250ac6312dc686ac3d1be5c43d491f0c4cc8fd300f74c3421b files/di
 MD5 b1c06ee1e68fc9f5bb532d64abce28a9 files/digest-util-vserver-0.30.213 268
 RMD160 7aeae48709273c8dc2fb98a9e11da2528e37835e files/digest-util-vserver-0.30.213 268
 SHA256 0be74fec3ac226a5314e1996449647bc8c279587e4285c9a378444b9aee388ab files/digest-util-vserver-0.30.213 268
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGStQCyuNVb5qfaOYRAhYRAKDQZMtA6cEzrFhIOU1s5i/LoQlkXACgq8hK
+smxokxtDqALR4agEAs5FHwU=
+=h+38
+-----END PGP SIGNATURE-----
diff --git a/sys-cluster/util-vserver/files/util-vserver-0.30.213-init-vserver.sh.patch b/sys-cluster/util-vserver/files/util-vserver-0.30.213-init-vserver.sh.patch
new file mode 100644
index 000000000000..2a83591663f5
--- /dev/null
+++ b/sys-cluster/util-vserver/files/util-vserver-0.30.213-init-vserver.sh.patch
@@ -0,0 +1,18 @@
+---
+ distrib/gentoo/init-vserver.sh |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/distrib/gentoo/init-vserver.sh
++++ b/distrib/gentoo/init-vserver.sh
+@@ -22,8 +22,10 @@
+ # Your vserver will not boot anymore!
+ #
+ # You have been warned...
+-#
+ 
++# Force TERM=linux for baselayout-2
++
++export TERM=linux
+ RUNLEVEL=1 /sbin/rc sysinit || exit 1
+ /sbin/rc boot || exit 1
+ /sbin/rc ${1:-default}
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.213.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.213.ebuild
index 9fadc6e5337c..8a3764b3d602 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.213.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.213.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.213.ebuild,v 1.1 2007/05/03 20:23:12 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.213.ebuild,v 1.2 2007/05/16 09:50:50 phreak Exp $
 
 WANT_AUTOMAKE="1.9"
 
@@ -41,6 +41,13 @@ pkg_setup() {
 	einfo
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-init-vserver.sh.patch
+}
+
 src_compile() {
 	econf --with-vrootdir=${VDIRBASE} \
 		--with-initscripts=gentoo \
@@ -71,6 +78,12 @@ src_install() {
 }
 
 pkg_postinst() {
+	# Create VDIRBASE in postinst, so it is (a) not unmerged and (b) also
+	# present when merging.
+	mkdir "${VDIRBASE}"
+	rm /etc/vservers/.defaults/vdirbase
+	ln -sf "${VDIRBASE}" /etc/vservers/.defaults/vdirbase
+
 	elog
 	elog "You have to run the vprocunhide command after every reboot"
 	elog "in order to setup /proc permissions correctly for vserver"