update util-vserver live svn ebuild

svn path=/; revision=82

8 files changed, 362 insertions, 178 deletions

diff --git a/sys-cluster/util-vserver-svn/Manifest b/sys-cluster/util-vserver-svn/Manifest
index 5b75952..29d0064 100644
--- a/sys-cluster/util-vserver-svn/Manifest
+++ b/sys-cluster/util-vserver-svn/Manifest
@@ -1,15 +1,19 @@
-AUX conf.d/vservers 1578 RMD160 11fb31684aa53f3575c0011cb346d662b7784e78 SHA1 891ad5d0f54a3ead93e114225974c580b3849d91 SHA256 f8376c99cde34b32c1447ab94905ec34f4c8c346d2f9c0788a341818ec7b4c47
-MD5 282a160e516cc1af59f5dfb372d67985 files/conf.d/vservers 1578
-RMD160 11fb31684aa53f3575c0011cb346d662b7784e78 files/conf.d/vservers 1578
-SHA256 f8376c99cde34b32c1447ab94905ec34f4c8c346d2f9c0788a341818ec7b4c47 files/conf.d/vservers 1578
-AUX init.d/vservers 2125 RMD160 95cecd8fc3378d54d7c7b5d98968381a5f2a095f SHA1 17b46a07ed0038834640c9acf6fbbb607ef07210 SHA256 be2e63a91badcf20810ce3fa333af232bd74057b7c0142264ff5c2f6cea5647e
-MD5 12a1318baf75b9f65a11931dfac06fa5 files/init.d/vservers 2125
-RMD160 95cecd8fc3378d54d7c7b5d98968381a5f2a095f files/init.d/vservers 2125
-SHA256 be2e63a91badcf20810ce3fa333af232bd74057b7c0142264ff5c2f6cea5647e files/init.d/vservers 2125
-EBUILD util-vserver-svn-9999.ebuild 3168 RMD160 fbfbd7583858aa9859c15858f5eb16c9db10fc11 SHA1 09dc91dcdcfa3f03d126afff7c686be5bdc20a97 SHA256 1d87c5112ab86fe64614eb09d3e70effa595cfd90f3433e0ec1634609d48f14c
-MD5 7255ff2fd262d9679d0e16275744f94f util-vserver-svn-9999.ebuild 3168
-RMD160 fbfbd7583858aa9859c15858f5eb16c9db10fc11 util-vserver-svn-9999.ebuild 3168
-SHA256 1d87c5112ab86fe64614eb09d3e70effa595cfd90f3433e0ec1634609d48f14c util-vserver-svn-9999.ebuild 3168
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-util-vserver-svn-9999 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-util-vserver-svn-9999 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-util-vserver-svn-9999 1
+AUX bash_completion 7568 RMD160 45feafa30f715fb287403518eee8c45fecfe418e SHA1 d281bcad111df21ab0f37703142dd102145d784e SHA256 2232166a5aed9857a7a5c30adfdd4ea944e0608a29fad05f229b8cef2d61795d
+MD5 20d9b2d8c50fe0ca9bb381d16daf2d7d files/bash_completion 7568
+RMD160 45feafa30f715fb287403518eee8c45fecfe418e files/bash_completion 7568
+SHA256 2232166a5aed9857a7a5c30adfdd4ea944e0608a29fad05f229b8cef2d61795d files/bash_completion 7568
+AUX init.d/vprocunhide 506 RMD160 b26000655f88eba51e2e80b5665f49b7698324a3 SHA1 f1bf6bc18f228c16090bbd8daec0b1e497ef75a8 SHA256 4e7f95b4bd0aca85383d0fc5ce9ffd78869a60e6f0f2dffaa4b1c8ec9d9b2c3d
+MD5 d5c496a8a3399c40a3c8b6d56de57aa2 files/init.d/vprocunhide 506
+RMD160 b26000655f88eba51e2e80b5665f49b7698324a3 files/init.d/vprocunhide 506
+SHA256 4e7f95b4bd0aca85383d0fc5ce9ffd78869a60e6f0f2dffaa4b1c8ec9d9b2c3d files/init.d/vprocunhide 506
+AUX init.d/vservers.default 320 RMD160 66fefb9908fe73b1d7967bd16b8cc5365d92a33a SHA1 0a5a198b00a5923b52005a34e46799d2815edaa7 SHA256 3b0812b59afaf39e5cefa4ddc1d27b7be7f7b58c69a2f045f4b7ae039dbe290c
+MD5 2ff1c739cd75282741b4ccea70f3a538 files/init.d/vservers.default 320
+RMD160 66fefb9908fe73b1d7967bd16b8cc5365d92a33a files/init.d/vservers.default 320
+SHA256 3b0812b59afaf39e5cefa4ddc1d27b7be7f7b58c69a2f045f4b7ae039dbe290c files/init.d/vservers.default 320
+EBUILD util-vserver-svn-9999.ebuild 2845 RMD160 af6a7369c3811a171d2a1618802abeedb82c8baa SHA1 3e0e42ce26d6fd5276952166c9ab715a9d723f00 SHA256 42c096a1f767bd9ec20c9d264a1dfcae2803cb802ee0397dd440b25d412aa9ea
+MD5 eea451aafe9c5e971f0873eab1119c27 util-vserver-svn-9999.ebuild 2845
+RMD160 af6a7369c3811a171d2a1618802abeedb82c8baa util-vserver-svn-9999.ebuild 2845
+SHA256 42c096a1f767bd9ec20c9d264a1dfcae2803cb802ee0397dd440b25d412aa9ea util-vserver-svn-9999.ebuild 2845
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-util-vserver-svn-9999 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-util-vserver-svn-9999 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-util-vserver-svn-9999 0
diff --git a/sys-cluster/util-vserver-svn/files/bash_completion b/sys-cluster/util-vserver-svn/files/bash_completion
new file mode 100644
index 0000000..73a9fef
--- /dev/null
+++ b/sys-cluster/util-vserver-svn/files/bash_completion
@@ -0,0 +1,300 @@
+# Completion for the vserver command. Source this file (or on some systems
+# add it to ~/.bash_completion and start a new shell) and bash's completion
+# mechanism will know all about vserver's options!
+#
+# Copyright (C) Thomas Champagne <lafeuil@gmail.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# The latest version of this software can be obtained here:
+#
+# http://linux-vserver.org/Vserver+Completion
+#
+# version 0.4.0
+
+have vserver-info && {
+: ${UTIL_VSERVER_VARS:=$(vserver-info - SYSINFO |grep prefix: | awk '{ print $2}')/lib/util-vserver/util-vserver-vars}
+
+test -e "$UTIL_VSERVER_VARS" && {
+
+. "$UTIL_VSERVER_VARS"
+. "$_LIB_FUNCTIONS"
+
+_vserver() {
+	local cur cmds cmdOpts cmdMethodOpts helpCmds names names_pipe func i j method
+
+	COMPREPLY=()
+	cur=${COMP_WORDS[COMP_CWORD]}
+
+	# find available vServers:
+	# call function getAllVservers in vserver library
+	getAllVservers names
+	names_pipe=`echo ${names[@]} | sed 's/ /|/g'`
+
+	# available commands
+	cmds='start stop restart condrestart suexec exec enter chkconfig \
+	running status unify pkg apt-get apt-config apt-cache \
+	rpm pkgmgmt delete'
+
+	# options (long and short name)
+	cmdOpts='--help --version --debug --defaulttty -s --sync -v \
+	--verbose --silent --'
+
+	cmdMethodOpts='-m -n --context --confdir --lockfile \
+	--hostname --netdev --netbcast --netmask \
+	--netprefix --interface --cpuset \
+	--cpusetcpus --cpusetmems --cpusetvirt \
+	--initstyle --flags --help --'
+
+	# if the previous option is a single option
+	helpCmds='--help|--version'
+	if [[ ${COMP_WORDS[1]} == @($helpCmds) ]] ; then
+		return 0
+	fi
+
+	# lookup the vServer name
+	for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )); do
+		if [[ ${COMP_WORDS[i]} == @($names_pipe) ]] ; then
+			# found it!
+			break
+		fi
+	done
+
+	#a vserver has been found
+	if (( $i < ${#COMP_WORDS[@]}-1 )) ; then
+		# Show the vserver command without build
+		case "${COMP_WORDS[i+1]}" in
+			start)
+				COMPREPLY=( $( compgen -W "--rescue --rescue-cmd" -- $cur ) )
+				;;
+			# No completion for apt-config
+			stop|restart|condrestart|enter|running|status|apt-config|delete)
+				;;
+			suexec)
+				# I don't know how to do
+				COMPREPLY=( $( compgen -W  -- $cur ) )
+				;;
+			exec)
+				#I don't know how to do
+				COMPREPLY=( $( compgen -W "" -- $cur ) )
+				;;
+			unify)
+				COMPREPLY=( $( compgen -W "-R" -- $cur ) )
+				;;
+			apt-get|apt-cache)
+				func=${COMP_WORDS[i+1]}
+				COMP_WORDS=( ${COMP_WORDS[@]:$((i+1))} )
+				COMP_CWORD=$((COMP_CWORD-i-1))
+				declare -f _${func//-/_} > /dev/null && _${func//-/_}
+				;;
+			*)
+				COMPREPLY=( $( compgen -W "$cmds" -- $cur ) )
+				;;
+		esac
+		return 0
+	else
+		#no vserver name found
+		prev=${COMP_WORDS[COMP_CWORD-1]}
+
+		#search the new name of vserver
+		for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )) ; do
+			if [[ ${COMP_WORDS[i]} == !(vserver|-*) ]] ; then
+				# found it!
+				break
+			fi
+		done
+
+		if (( $i < ${#COMP_WORDS[@]}-1 )) ; then
+			j=$i
+			i=${#COMP_WORDS[@]}
+			for (( ; j < ${#COMP_WORDS[@]}-1; j++ )) ; do
+				if [[ ${COMP_WORDS[j]} == "--" ]];  then
+					# method's parameter
+					case "$method" in
+						legacy|copy)
+							;;
+						apt-rpm)
+							COMPREPLY=( $( compgen -W "-d" -- $cur ) )
+							;;
+						yum)
+							COMPREPLY=( $( compgen -W "-d" -- $cur ) )
+							;;
+						rpm)
+							COMPREPLY=( $( compgen -W "-d --empty --force --nodeps" -- $cur ) )
+							;;
+						skeleton)
+							;;
+						debootstrap)
+							COMPREPLY=( $( compgen -W "-d -m -s --" -- $cur ) )
+							;;
+						*)
+							;;
+					esac
+					return 0
+					break
+				fi
+
+				if [[ ${COMP_WORDS[j]} == @(build|-m) ]];  then
+					i=$j
+					if (( $j+1 < ${#COMP_WORDS[@]}-1 )) ; then
+						method=${COMP_WORDS[j+1]}
+					fi
+				fi
+			done
+
+			if (( $i < ${#COMP_WORDS[@]}-1 )) ; then
+				case $prev in
+					--help)
+						;;
+					-n|--context|--confdir|--lockfile|--hostname|--netdev|--netbcast|--netmask|--netprefix|--interface|--cpuset|--cpusetcpus|--cpusetmems|--cpusetvirt|--initstyle|--flags)
+						COMPREPLY=( $( compgen -W "" -- $cur ) )
+						;;
+					-m)
+						COMPREPLY=( $( compgen -W "legacy copy apt-rpm yum rpm skeleton debootstrap" -- $cur ) )
+						;;
+					*)
+						COMPREPLY=( $( compgen -W "$cmdMethodOpts" -- $cur ) )
+						;;
+				esac
+			else
+				COMPREPLY=( $( compgen -W "build" -- $cur ) )
+			fi
+		else
+			COMPREPLY=( $( compgen -W "${names[@]} $cmdOpts" -- $cur ) )
+		fi
+
+		return 0
+	fi
+
+	return 0
+}
+
+complete -F _vserver vserver
+
+_vapt_rpm_yum()
+{
+	local cur cmds cmdOpts helpCmds names func i
+
+	COMPREPLY=()
+	cur=${COMP_WORDS[COMP_CWORD]}
+
+	# options (long and short name)
+	cmdOpts='--help --version --quiet -q --all'
+
+	# if the previous option is a single option
+	helpCmds='--help|--version'
+
+	if [[ "${COMP_WORDS[1]}" == "@($helpCmds)" ]] ; then
+		return 0
+	fi
+
+	# search --
+	for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )) ; do
+		if [[ ${COMP_WORDS[i]} = "--" ]] ; then
+			# found it!
+			break
+		fi
+	done
+
+	# find available vServers
+	# call function getAllVservers in vserver library
+	getAllVservers names
+	names_pipe=`echo ${names[@]}" --all" | sed 's/ /|/g'`
+
+	if (( $i < ${#COMP_WORDS[@]}-1 )) && (( $i < $COMP_CWORD )) ; then
+		func=${COMP_WORDS[0]:1}
+		COMP_WORDS=( $func ${COMP_WORDS[@]:$((i+1))} )
+		COMP_CWORD=$((COMP_CWORD-i))
+		declare -f _${func//-/_} > /dev/null && _${func//-/_}
+	else
+		# search vServer name
+		for (( i=0; i <  ${#COMP_WORDS[@]}-1; i++ )) ; do
+			if [[ ${COMP_WORDS[i]} == @($names_pipe) ]] ; then
+				# found it!
+				break
+			fi
+		done
+
+		if (( $i < ${#COMP_WORDS[@]}-1 )) ; then
+			if [[ "${COMP_WORDS[i]}" = "--all"  ]] ; then
+				cmdOpts='--'
+				COMPREPLY=( $( compgen -W "$cmdOpts" -- $cur ) )
+			else
+				cmdOpts='--'
+				COMPREPLY=( $( compgen -W "${names[@]} $cmdOpts" -- $cur ) )
+			fi
+		else
+			COMPREPLY=( $( compgen -W "${names[@]} $cmdOpts" -- $cur ) )
+		fi
+	fi
+
+	return 0
+}
+
+_vserver_copy()
+{
+	local cur prev cmdOpts helpCmds confCmds names names_pipe i
+
+	COMPREPLY=()
+	cur=${COMP_WORDS[COMP_CWORD]}
+
+	# find available vServers
+	# call function getAllVservers in vserver library
+	getAllVservers names
+	names_pipe=`echo ${names[@]} | sed 's/ /|/g'`
+
+	# options (long and short name)
+	cmdOpts='--help -h --version -V --verbose -v --quiet -q \
+		 --vsroot -r --rsh -R --stopstart -s \
+		 --domain -d --ip -i'
+
+	# if the previous option is a single option
+	helpCmds='--help|-h|--version|-V'
+
+	if [[ ${COMP_WORDS[1]} == @($helpCmds) ]] ; then
+		return 0
+	fi
+
+	confCmds='--ip|-i|--domain|-d'
+	prev=${COMP_WORDS[COMP_CWORD-1]}
+
+	if [[ $prev == @($confCmds) ]] ; then
+		return 0
+	fi
+
+	# search a vServer name
+	for (( i=0; i <  ${#COMP_WORDS[@]}-1; i++ )); do
+		if [[ ${COMP_WORDS[i]} == @($names_pipe) ]] ; then
+			# found it!
+			break
+		fi
+	done
+
+	if (( $i < ${#COMP_WORDS[@]}-1 )) ; then
+		return 0
+	else
+		COMPREPLY=( $( compgen -W "${names[@]} $cmdOpts" -- $cur ) )
+	fi
+
+	return 0
+}
+
+complete -F _vapt_rpm_yum vapt-get
+complete -F _vapt_rpm_yum vrpm
+complete -F _vapt_rpm_yum vyum
+complete -F _vserver_copy vserver-copy
+
+}
+}
diff --git a/sys-cluster/util-vserver-svn/files/conf.d/vservers b/sys-cluster/util-vserver-svn/files/conf.d/vservers
deleted file mode 100644
index 15e25c5..0000000
--- a/sys-cluster/util-vserver-svn/files/conf.d/vservers
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# A space-delimited list of vserver MARKS to start. 
-# Identification of vservers happens by
-# putting the flavor into /etc/vservers/<vserver-id>/apps/init/mark.
-# Note: on stop the init script will stop ALL running vservers
-MARKS="default"
-
-# A space-delimited list of vservers to start
-# This can be used together with MARKS or as a replacement
-# Note: on stop the init script will stop ALL running vservers
-#START_VSERVERS=""
-
-# Wether to start all vserver MARKS by default (supersedes MARKS)
-# This will be enabled if STARTALL is set regardless of its content
-# i.e. you have to comment to disable it
-# Note: on stop the init script will stop ALL running vservers
-#STARTALL=yes
-
-# Number of vservers which shall be started in parallel; since most
-# initmethods are spending much time in sleeps, it is safe to
-# use a high number here, though you should pay attention if you make 
-# use of depends in /etc/vservers as some services may not be up if
-# started in parallel
-#NUMPARALLEL=6
-
-# The name of the vserver lock directory which is used by the init script
-# to determine which MARKS have already been started (used within
-# vstatus() to show the status of MARKS). Default should be good
-# for everyone. Change at your own risk
-#LOCKDIR=/var/lock/vservers
-
-# The location of util-vserver-vars
-# This file contains variables to util-vserver scripts used within the
-# init script. Change at your own risk.
-#UTIL_VSERVER_VARS=/usr/lib/util-vserver/util-vserver-vars
diff --git a/sys-cluster/util-vserver-svn/files/digest-util-vserver-svn-9999 b/sys-cluster/util-vserver-svn/files/digest-util-vserver-svn-9999
index 8b13789..e69de29 100644
--- a/sys-cluster/util-vserver-svn/files/digest-util-vserver-svn-9999
+++ b/sys-cluster/util-vserver-svn/files/digest-util-vserver-svn-9999
@@ -1 +0,0 @@
-
diff --git a/sys-cluster/util-vserver-svn/files/init.d/vprocunhide b/sys-cluster/util-vserver-svn/files/init.d/vprocunhide
new file mode 100755
index 0000000..d7199ca
--- /dev/null
+++ b/sys-cluster/util-vserver-svn/files/init.d/vprocunhide
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+start() {
+	: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
+	if [[ ! -e ${UTIL_VSERVER_VARS} ]]; then
+		eerror "Cannot find util-vserver installation"
+		eerror "(the file '$UTIL_VSERVER_VARS' would be expected)"
+		return 1
+	fi
+	
+	source ${UTIL_VSERVER_VARS}
+	
+	ebegin "Fixing /proc entries visibility"
+	${_VPROCUNHIDE}
+	eend $?
+}
+
+# vim:ts=4:filetype=gentoo-init-d
diff --git a/sys-cluster/util-vserver-svn/files/init.d/vservers b/sys-cluster/util-vserver-svn/files/init.d/vservers
deleted file mode 100755
index 52c1cd7..0000000
--- a/sys-cluster/util-vserver-svn/files/init.d/vservers
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-opts="${opts} vstatus"
-
-checkconfig() {
-	: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
-	if [[ ! -e ${UTIL_VSERVER_VARS} ]]; then
-		eerror "Cannot find util-vserver installation"
-		eerror "(the file '$UTIL_VSERVER_VARS' would be expected)"
-		exit 1
-	fi
-	
-	source ${UTIL_VSERVER_VARS}
-	source ${_LIB_GENTOO_FUNCTIONS}
-	
-	: ${MARKS:=default}
-	: ${NUMPARALLEL:=1}
-	: ${LOCKDIR:=/var/lock/vservers}
-}
-
-start() {
-	checkconfig
-	
-	ebegin "Unhiding /proc entries"
-	${_VPROCUNHIDE}
-	eend $?
-	
-	if [[ -n ${STARTALL} ]]; then
-		ebegin "Starting all types of vservers"
-		${_START_VSERVERS} -j ${NUMPARALLEL} --all --start
-		local rc=$?
-		[[ $rc -eq 0 ]] && touch ${LOCKDIR}/all
-		eend $rc
-	else
-		for MARK in ${MARKS}; do
-			ebegin "Starting vservers of type '${MARK}'"
-			${_START_VSERVERS} -m ${MARK} -j ${NUMPARALLEL} --all --start
-			local rc=$?
-			[[ $rc -eq 0 ]] && touch ${LOCKDIR}/${MARK}
-			eend $rc
-		done
-	fi
-	
-	for VSERVER in ${START_VSERVERS}; do
-		ebegin "Starting single vserver '${VSERVER}'"
-		${_VSERVER} ${VSERVER} start
-		eend $?
-	done
-}
-
-stop() {
-	checkconfig
-	
-	ebegin "Stopping all types of vservers"
-	${_START_VSERVERS} -j ${NUMPARALLEL} --all --stop
-	eend $?
-	
-	rm -f ${LOCKDIR}/*
-	
-	einfo "Checking for vservers still running ..."
-	
-	for i in $(vs_running_name 1); do
-		ebegin "  Stopping single vserver: ${i}"
-		/usr/sbin/vserver ${i} stop &> /dev/null
-		eend $?
-	done
-}
-
-vstatus() {
-	checkconfig
-	
-	local running="false"
-	
-	einfo "${LOCKDIR} shows the following types of vservers running:"
-	
-	for i in $( ls ${LOCKDIR} | sort ); do
-		einfo "  ${i}"
-		running="true"
-	done
-	
-	if [[ "${running}" != "true" ]]; then
-		einfo "  none"
-	fi
-	
-	running="false"
-	
-	einfo
-	einfo "/proc/virtual/ says these are running:"
-	
-	for i in $(vs_running_name 1); do
-		einfo "  ${i}"
-		running="true"
-	done
-	
-	if [[ "${running}" != "true" ]]; then
-		einfo "  none"
-	fi
-	
-	
-	einfo
-	einfo "vserver-stat says these are running:"
-	/usr/sbin/vserver-stat
-}
-
-# vim:ts=4:filetype=gentoo-init-d
diff --git a/sys-cluster/util-vserver-svn/files/init.d/vservers.default b/sys-cluster/util-vserver-svn/files/init.d/vservers.default
new file mode 100755
index 0000000..52eb322
--- /dev/null
+++ b/sys-cluster/util-vserver-svn/files/init.d/vservers.default
@@ -0,0 +1,15 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+start() {
+	MARK=${0##*/vserver.} /usr/lib/util-vserver/vserver-wrapper start
+}
+
+stop() {
+	MARK=${0##*/vserver.} /usr/lib/util-vserver/vserver-wrapper stop
+}
+
+
+
+# vim:ts=4:filetype=gentoo-init-d
diff --git a/sys-cluster/util-vserver-svn/util-vserver-svn-9999.ebuild b/sys-cluster/util-vserver-svn/util-vserver-svn-9999.ebuild
index 91d98f1..2fed17c 100644
--- a/sys-cluster/util-vserver-svn/util-vserver-svn-9999.ebuild
+++ b/sys-cluster/util-vserver-svn/util-vserver-svn-9999.ebuild
@@ -60,6 +60,7 @@ src_compile() {
 
 src_install() {
 	make DESTDIR="${D}" install || die "install failed"
+	make DESTDIR="${D}" install-distribution || die "install-distribution failed"
 
 	# keep dirs
 	keepdir /var/run/vservers
@@ -67,19 +68,20 @@ src_install() {
 	keepdir /var/run/vshelper
 	keepdir /var/lock/vservers
 	keepdir /var/cache/vservers
-
 	keepdir "${VDIRBASE}"
-	fperms 000 "${VDIRBASE}"
+
+	# remove legacy config file
+	rm -f "${D}"/etc/vservers.conf
 
 	# remove the non-gentoo init-scripts:
 	rm -f "${D}"/etc/init.d/*
 
 	# and install gentoo'ized ones:
-	doinitd "${FILESDIR}"/init.d/vservers
-	doconfd "${FILESDIR}"/conf.d/vservers
+	doinitd "${FILESDIR}"/init.d/vservers.default
+	doinitd "${FILESDIR}"/init.d/vprocunhide
 
 	# bash-completion
-#	dobashcompletion contrib/bash_completion util-vserver
+	dobashcompletion "${FILESDIR}"/bash_completion util-vserver
 
 	dodoc README ChangeLog NEWS AUTHORS THANKS util-vserver.spec
 }
@@ -91,23 +93,11 @@ pkg_postinst() {
 	einfo "use. An init script has been installed by this package."
 	einfo "To use it you should add it to a runlevel:"
 	einfo
-	einfo " rc-update add vservers default"
-	einfo
-	einfo "This init script will also help you to start/stop your vservers"
-	einfo "on reboot. See ${ROOT}etc/conf.d/vserver for details"
+	einfo " rc-update add vprocunhide default"
 	ewarn
 	ewarn "You should definitly fix up the barrier of your vserver"
 	ewarn "base directory by using the following command in a root shell:"
 	ewarn
 	ewarn " setattr --barrier ${VDIRBASE}"
 	ewarn
-	ewarn "IMPORTANT UPGRADE WARNING:"
-	ewarn
-	ewarn "Since 0.30.208-r3 the vprocunhide init-script has been merged"
-	ewarn "with the vservers init script. The following steps are"
-	ewarn "required to keep current behaviour:"
-	ewarn
-	ewarn " rc-update del vprocunhide"
-	ewarn " rc-update add vservers default"
-	ewarn
 }