diff options
author | Christian Heim <phreak@gentoo.org> | 2007-05-16 09:50:50 +0000 |
---|---|---|
committer | Christian Heim <phreak@gentoo.org> | 2007-05-16 09:50:50 +0000 |
commit | 6bc27bcc3b198ab5a7a14a9358d51a0b6727f9e6 (patch) | |
tree | 2e90e9bbaaac92f0b7618fd54d7a8e2d0739504a /sys-cluster | |
parent | Install FLTKConfig.cmake and FLTKUse.cmake for bug 175006. (diff) | |
download | gentoo-2-6bc27bcc3b198ab5a7a14a9358d51a0b6727f9e6.tar.gz gentoo-2-6bc27bcc3b198ab5a7a14a9358d51a0b6727f9e6.tar.bz2 gentoo-2-6bc27bcc3b198ab5a7a14a9358d51a0b6727f9e6.zip |
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.
(Portage version: 2.1.2.7)
Diffstat (limited to 'sys-cluster')
-rw-r--r-- | sys-cluster/util-vserver/ChangeLog | 8 | ||||
-rw-r--r-- | sys-cluster/util-vserver/files/util-vserver-0.30.213-init-vserver.sh.patch | 18 | ||||
-rw-r--r-- | sys-cluster/util-vserver/util-vserver-0.30.213.ebuild | 15 |
3 files changed, 39 insertions, 2 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/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" |