summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Heim <phreak@gentoo.org>2007-01-21 00:10:14 +0000
committerChristian Heim <phreak@gentoo.org>2007-01-21 00:10:14 +0000
commitd4db2ff84a70a0ea01015a6224d95dda7faf7174 (patch)
treed2be2a5b90706f5b9fe63316764396484b103b7b /sys-cluster/util-vserver
parentStable on x86, bug #162959. (diff)
downloadgentoo-2-d4db2ff84a70a0ea01015a6224d95dda7faf7174.tar.gz
gentoo-2-d4db2ff84a70a0ea01015a6224d95dda7faf7174.tar.bz2
gentoo-2-d4db2ff84a70a0ea01015a6224d95dda7faf7174.zip
Adding a patch to fix runlevel scripts for older baselayouts. util-vserver-0.30.212 going stable on amd64 and x86.
(Portage version: 2.1.2-r1)
Diffstat (limited to 'sys-cluster/util-vserver')
-rw-r--r--sys-cluster/util-vserver/ChangeLog7
-rw-r--r--sys-cluster/util-vserver/files/util-vserver-0.30.212-initpost.patch62
-rw-r--r--sys-cluster/util-vserver/util-vserver-0.30.212.ebuild5
3 files changed, 71 insertions, 3 deletions
diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index 12ee86e2a443..f96b95c11057 100644
--- a/sys-cluster/util-vserver/ChangeLog
+++ b/sys-cluster/util-vserver/ChangeLog
@@ -1,6 +1,11 @@
# 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.69 2007/01/20 12:35:49 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.70 2007/01/21 00:10:13 phreak Exp $
+
+ 20 Jan 2007; Christian Heim <phreak@gentoo.org>
+ +files/util-vserver-0.30.212-initpost.patch, util-vserver-0.30.212.ebuild:
+ Adding a patch to fix runlevel scripts for older baselayouts.
+ util-vserver-0.30.212 going stable on amd64 and x86.
20 Jan 2007; Christian Heim <phreak@gentoo.org>
util-vserver-0.30.212.ebuild:
diff --git a/sys-cluster/util-vserver/files/util-vserver-0.30.212-initpost.patch b/sys-cluster/util-vserver/files/util-vserver-0.30.212-initpost.patch
new file mode 100644
index 000000000000..dfb45db9c4f5
--- /dev/null
+++ b/sys-cluster/util-vserver/files/util-vserver-0.30.212-initpost.patch
@@ -0,0 +1,62 @@
+Index: /trunk/distrib/gentoo/initpost
+===================================================================
+--- /trunk/distrib/gentoo/initpost (revision 2366)
++++ /trunk/distrib/gentoo/initpost (revision 2465)
+@@ -18,5 +18,6 @@
+ ## Called as: initpost <cfgdir> <path of util-vserver-vars>
+
+-vdir="$1"/vdir
++cfgdir="$1"
++vdir="$cfgdir"/vdir
+ . "$2"
+
+@@ -30,5 +31,5 @@
+ # gentoo initstyle magic
+ initstyle=sysv
+-test -e "$1"/apps/init/style && initstyle=$(<"$1"/apps/init/style)
++test -e "$cfgdir"/apps/init/style && initstyle=$(<"$cfgdir"/apps/init/style)
+
+ if test "$initstyle" == "gentoo"; then
+@@ -52,4 +53,29 @@
+ echo "!!!"
+ fi
++
++
++# unneeded runlevel scripts
++pushd "$vdir" &>/dev/null
++echo ">>> Fixing default runlevel scripts ... "
++$_CHROOT_SH rm /etc/runlevels/boot/{clock,consolefont,keymaps,modules,net.lo} 2>/dev/null || :
++$_CHROOT_SH rm /etc/runlevels/default/{hdparm,netmount} 2>/dev/null || :
++popd &>/dev/null
++
++
++# setting hostname
++pushd "$vdir" &>/dev/null
++
++if test -r "$cfgdir"/uts/nodename && $_CHROOT_SH testfile /etc/conf.d/hostname; then
++ echo ">>> Setting hostname ... "
++ hostnametmp=$($_MKTEMP hostname.XXXXXX)
++
++ $_CHROOT_SH cat /etc/conf.d/hostname | \
++ $_SED "s:HOSTNAME=\"\(.*\)\":HOSTNAME=\"$(< "$cfgdir"/uts/nodename)\":" > $hostnametmp
++ $_CHROOT_SH truncate /etc/conf.d/hostname < $hostnametmp
++
++ $_RM -f $hostnametmp
++fi
++
++popd &>/dev/null
+
+
+@@ -89,12 +115,4 @@
+
+
+-# unneeded runlevel scripts
+-pushd "$vdir" &>/dev/null
+-echo ">>> Fixing default runlevel scripts ... "
+-$_CHROOT_SH rm /etc/runlevels/boot/{clock,consolefont,keymaps,modules,net.lo} 2>/dev/null || :
+-$_CHROOT_SH rm /etc/runlevels/default/{hdparm,netmount} 2>/dev/null || :
+-popd &>/dev/null
+-
+-
+ # fix fstab for checkfs/localmount
+ pushd "$vdir" &>/dev/null
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.212.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.212.ebuild
index 3e9326a89aeb..d2fd0ab446f4 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.212.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.212.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.212.ebuild,v 1.3 2007/01/20 12:35:49 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.212.ebuild,v 1.4 2007/01/21 00:10:13 phreak Exp $
WANT_AUTOMAKE="1.9"
WANT_AUTOCONF="latest"
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.linux-vserver.org/pub/utils/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
IUSE=""
@@ -47,6 +47,7 @@ src_unpack() {
cd "${S}"
epatch "${FILESDIR}"/${P}-wrapper.patch
+ epatch "${FILESDIR}"/${P}-initpost.patch
}
src_compile() {