Revision bump, fixing the initpost patch (thanks to Karel Hala <stripe at suchdol.net> in #163045).

(Portage version: 2.1.2-r1)

4 files changed, 80 insertions, 64 deletions

diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index f96b95c11057..721ff43ef787 100644
--- a/sys-cluster/util-vserver/ChangeLog
+++ b/sys-cluster/util-vserver/ChangeLog
@@ -1,6 +1,14 @@
 # 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.70 2007/01/21 00:10:13 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.71 2007/01/21 11:34:53 phreak Exp $
+
+*util-vserver-0.30.212-r1 (21 Jan 2007)
+
+  21 Jan 2007; Christian Heim <phreak@gentoo.org>
+  files/util-vserver-0.30.212-initpost.patch, -util-vserver-0.30.212.ebuild,
+  +util-vserver-0.30.212-r1.ebuild:
+  Revision bump, fixing the initpost patch (thanks to Karel Hala <stripe at
+  suchdol.net> in #163045).
 
   20 Jan 2007; Christian Heim <phreak@gentoo.org>
   +files/util-vserver-0.30.212-initpost.patch, util-vserver-0.30.212.ebuild:
diff --git a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.212 b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.212-r1
index 0babb2f87de0..0babb2f87de0 100644
--- a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.212
+++ b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.212-r1
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
index dfb45db9c4f5..27178416d3a8 100644
--- 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
@@ -1,62 +1,70 @@
-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

+Index: util-vserver-0.30.212/distrib/gentoo/initpost
+===================================================================
+--- util-vserver-0.30.212.orig/distrib/gentoo/initpost
++++ util-vserver-0.30.212/distrib/gentoo/initpost
+@@ -17,7 +17,8 @@
+ 
+ ## Called as: initpost <cfgdir> <path of util-vserver-vars>
+ 
+-vdir="$1"/vdir
++cfgdir="$1"
++vdir="$cfgdir"/vdir
+ . "$2"
+ 
+ # portage stuff
+@@ -29,7 +30,7 @@ popd &>/dev/null
+ 
+ # 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
+ 	pushd "$vdir" &>/dev/null
+@@ -53,6 +54,31 @@ if test "$initstyle" == "gentoo"; then
+ 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
++
++
+ # check for baselayout >= 1.13
+ pushd "$vdir" &>/dev/null
+ basever=$($_CHROOT_SH cat /etc/gentoo-release | $_AWK '{print $5}')
+@@ -88,14 +114,6 @@ fi
+ popd &>/dev/null
+ 
+ 
+-# 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
+ echo ">>> Fixing fstab ... "
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.212.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.212-r1.ebuild
index d2fd0ab446f4..3c2d2c032e28 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.212.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.212-r1.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.4 2007/01/21 00:10:13 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.212-r1.ebuild,v 1.1 2007/01/21 11:34:53 phreak Exp $
 
 WANT_AUTOMAKE="1.9"
 WANT_AUTOCONF="latest"