summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenedikt Boehm <hollow@gentoo.org>2007-01-21 13:58:02 +0000
committerBenedikt Boehm <hollow@gentoo.org>2007-01-21 13:58:02 +0000
commit5d99cbe3a662bb0b43110bbb187e64c20779b986 (patch)
tree31264a4045119efd37978ab5fc1bb9174edafa0f /sys-cluster/vzctl
parentfix #158114; cleanup (diff)
downloadhistorical-5d99cbe3a662bb0b43110bbb187e64c20779b986.tar.gz
historical-5d99cbe3a662bb0b43110bbb187e64c20779b986.tar.bz2
historical-5d99cbe3a662bb0b43110bbb187e64c20779b986.zip
fix #158114; cleanup
Package-Manager: portage-2.1.2_rc1-r6
Diffstat (limited to 'sys-cluster/vzctl')
-rw-r--r--sys-cluster/vzctl/Manifest44
-rw-r--r--sys-cluster/vzctl/files/digest-vzctl-3.0.133
-rw-r--r--sys-cluster/vzctl/files/vz-3.0.10.initd263
-rw-r--r--sys-cluster/vzctl/vzctl-3.0.13.ebuild61
4 files changed, 16 insertions, 355 deletions
diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index 2ed0934f61d8..e05e9019e92d 100644
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -1,10 +1,6 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX vz-3.0.10.initd 5857 RMD160 20c18e403ee8d5c2fea72026f0c0d4f6d00a7381 SHA1 b6f6a00399cab7d8249d8a744ad86135e80be15f SHA256 ce3f721de30e3ae18286cdfccdac44c9b01f84838e336a9d1b9a5ff59e8a0480
-MD5 65ad1bf9fada9b4649e5e85cf5750b7b files/vz-3.0.10.initd 5857
-RMD160 20c18e403ee8d5c2fea72026f0c0d4f6d00a7381 files/vz-3.0.10.initd 5857
-SHA256 ce3f721de30e3ae18286cdfccdac44c9b01f84838e336a9d1b9a5ff59e8a0480 files/vz-3.0.10.initd 5857
AUX vz.initd 5465 RMD160 303e4877e95db9f90d512b37d67cdaa94e823d52 SHA1 967cc1a9d71109db574f565d2f733332cfafcf50 SHA256 63c17d2783cfd01fcfb66aa8b0c572ea6bf366d59a72c10f1728091c7eaa5fc0
MD5 a2de79b189da1c2d3fd01fa2116bcea9 files/vz.initd 5465
RMD160 303e4877e95db9f90d512b37d67cdaa94e823d52 files/vz.initd 5465
@@ -15,24 +11,19 @@ RMD160 0a1fda036be77bfc5b4569ba5c0df395deb0ec7a files/vzctl-3.0.14-ndsend.c.patc
SHA256 8fef90a7b4c8193c0df7b8460fc5345bf7eca5b07d7a00691a7468fe45967418 files/vzctl-3.0.14-ndsend.c.patch 333
DIST vzctl-3.0.0-8.tar.bz2 115033 RMD160 5bba4d678ea617f05220b4aca921ea62cd355e98 SHA1 f6dc12f3572897cbc9f0ebf8b4f438756b320983 SHA256 7322bebc6f6b476cd2c8a1f9a3e601f9e723142ee317eb3304d40d0e068fc632
DIST vzctl-3.0.0.8-patches-r0.tar.bz2 3816 RMD160 33fa63aa9749beedf6bd7dfd03f11658edfa6266 SHA1 727e323d73c3505ebc47221850df7f695f7bc43d SHA256 f1ac3df3a9f6f0f62ef97dd0b770cee800c37e3a267105c8fddc2f68dd05d535
-DIST vzctl-3.0.13.tar.bz2 129562 RMD160 8d161c1249c90d817044c0638da0bbae4d3041b1 SHA1 f7b4ea671146f43e7fdd9876b8e963211208a2a2 SHA256 c087a6ac18249e9050825fc371b324757ef2ff26de747e25bcaacf591bbd8b76
-DIST vzctl-3.0.14.tar.bz2 356300 RMD160 529b4e3bb1fbcf673831d2891becedf6e003dcd8 SHA1 c773b495d688ee6b172d1c0941a5a57e2c188c57 SHA256 86be0231fd12f97e45bae8dae86fadc466e631051d4ee04569d40bb8f82d8b83
+DIST vzctl-3.0.14.tar.bz2 358414 RMD160 473a3c88e1644c01fd4036bbf0affb129143f814 SHA1 8bc9b1da6052618728f513d0d9827f8e23d9fb86 SHA256 0b9e50c9fc29c7ba68401213c783968f4489a62dafc41158d0dcd357223e817c
EBUILD vzctl-3.0.0.8.ebuild 1720 RMD160 1a4021b5cbecc80d523d5c207911ab558bb08393 SHA1 a3d5124f6e47ff95f5b7fc5359533f88e893542e SHA256 05e79597417cca500073db713bed3da8c4ea95ed4f0788279c7235dc789fbe3c
MD5 8c19abdd920fd9bc4734c496aae0bec4 vzctl-3.0.0.8.ebuild 1720
RMD160 1a4021b5cbecc80d523d5c207911ab558bb08393 vzctl-3.0.0.8.ebuild 1720
SHA256 05e79597417cca500073db713bed3da8c4ea95ed4f0788279c7235dc789fbe3c vzctl-3.0.0.8.ebuild 1720
-EBUILD vzctl-3.0.13.ebuild 1870 RMD160 466079e348d8796b00d6db46268414c2940d2de3 SHA1 6b9bc1ac724429b3269b91cf3511e9d2874ae037 SHA256 740161da009861f899deedfc69dadc94960f5d21dea597b89c80aaa665c5f10d
-MD5 e808e31e8cf567e1f0a63a06b68ead49 vzctl-3.0.13.ebuild 1870
-RMD160 466079e348d8796b00d6db46268414c2940d2de3 vzctl-3.0.13.ebuild 1870
-SHA256 740161da009861f899deedfc69dadc94960f5d21dea597b89c80aaa665c5f10d vzctl-3.0.13.ebuild 1870
-EBUILD vzctl-3.0.14.ebuild 1635 RMD160 4988e8e0f08888be4a29079bcbf905f41a123c08 SHA1 41893a35933eaa7a6d8bfe696f018f7c769755bf SHA256 c683e0865dc52051991589a648e9e8d28b0f83bfdf780db4636bedb68fc24015
-MD5 ed78b3df8e864d65fa92741ca6b5a17b vzctl-3.0.14.ebuild 1635
-RMD160 4988e8e0f08888be4a29079bcbf905f41a123c08 vzctl-3.0.14.ebuild 1635
-SHA256 c683e0865dc52051991589a648e9e8d28b0f83bfdf780db4636bedb68fc24015 vzctl-3.0.14.ebuild 1635
-MISC ChangeLog 7591 RMD160 a3b4ad35d3b4a4311868ffd597d03376828d1e9c SHA1 98fd7af1a34dd1d8bea003d925112a5019cf8aec SHA256 84434135be152afcd86337d885f03e2fb3b139ee0aef29d8ca32ab24c36caa05
-MD5 9e91cb0d9b6fe4cf85f8ce3c8f475248 ChangeLog 7591
-RMD160 a3b4ad35d3b4a4311868ffd597d03376828d1e9c ChangeLog 7591
-SHA256 84434135be152afcd86337d885f03e2fb3b139ee0aef29d8ca32ab24c36caa05 ChangeLog 7591
+EBUILD vzctl-3.0.14.ebuild 1602 RMD160 9f24bc44adf9a5174d93c2f6024fd0e1fac3b0e3 SHA1 49a5a7dbdfb739557be2a5866285201416248c2a SHA256 a1b2a3fde2acc9f7ab181a80a2df173f7f1c80bb1ed17ee22e23596d4725a6e5
+MD5 c5f211fd46dc01a71c4b62d2449b4594 vzctl-3.0.14.ebuild 1602
+RMD160 9f24bc44adf9a5174d93c2f6024fd0e1fac3b0e3 vzctl-3.0.14.ebuild 1602
+SHA256 a1b2a3fde2acc9f7ab181a80a2df173f7f1c80bb1ed17ee22e23596d4725a6e5 vzctl-3.0.14.ebuild 1602
+MISC ChangeLog 7734 RMD160 4cbbf4fb28e1175a2846849bb750f09b3522b148 SHA1 362c972e7fbadc6755fe573a67b94cc1d26fdeab SHA256 42dcf12b51eb12c093c0a8f92f0e5ba76a3d54b59470d8ba89e199cd67aed31b
+MD5 1e6a8cb3ab4f30174f6dc53783704afc ChangeLog 7734
+RMD160 4cbbf4fb28e1175a2846849bb750f09b3522b148 ChangeLog 7734
+SHA256 42dcf12b51eb12c093c0a8f92f0e5ba76a3d54b59470d8ba89e199cd67aed31b ChangeLog 7734
MISC metadata.xml 231 RMD160 532e75c33676f402571b5033faf42b7d0dbb9d28 SHA1 5e2b3b183660e76e9a8d93b7aeab6ce5857581c1 SHA256 018942ba3f2ac5b93ec2576f55ff8d85b7808b35b751bfabb1879957f4f6c442
MD5 e5ba31c20aa49371e645a8950abd1054 metadata.xml 231
RMD160 532e75c33676f402571b5033faf42b7d0dbb9d28 metadata.xml 231
@@ -40,16 +31,13 @@ SHA256 018942ba3f2ac5b93ec2576f55ff8d85b7808b35b751bfabb1879957f4f6c442 metadata
MD5 29df91389efeb4843177a9078a89ca58 files/digest-vzctl-3.0.0.8 515
RMD160 9e0f277c9a8385fa918174cc1edc0f9e641dec50 files/digest-vzctl-3.0.0.8 515
SHA256 dc1dba3fb70c9a7212de8916eaaeb3c2b4a6b847702d90e0c58d06c62e9b3dc2 files/digest-vzctl-3.0.0.8 515
-MD5 aaaf174fe27349eec16072c6523280ed files/digest-vzctl-3.0.13 241
-RMD160 b6e8fa07379d2c8c884ac9025d8720addab2eb88 files/digest-vzctl-3.0.13 241
-SHA256 335b6a51a7ca25cc81b1106514f4ef55a1016edf9393aeaca6b5dcf1281889a0 files/digest-vzctl-3.0.13 241
-MD5 604d30b9c731718babaeebabb624dd01 files/digest-vzctl-3.0.14 241
-RMD160 f2ada0ab328e14ff8b97255c320a6fdc82b9f89a files/digest-vzctl-3.0.14 241
-SHA256 f31d206d22b741c4a7e5b5acee694512e153e1d7f8c4e61e1e9d31c9d633d611 files/digest-vzctl-3.0.14 241
+MD5 df1a21a6d135dec88a42f15c5882321a files/digest-vzctl-3.0.14 241
+RMD160 d08b4284c41a4eb4ea6781b42ae9a004394430b3 files/digest-vzctl-3.0.14 241
+SHA256 6735b25cf91d00148fa58f1581d7b091fa93cb766279f7a5c6cb7b820f967f1d files/digest-vzctl-3.0.14 241
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
-iD8DBQFFr4l8yuNVb5qfaOYRAgC8AJ9YGmsQbeLCGvdSmsFO2dKwzOE/twCcC2As
-67aB4qXELDAysPTlga1evIo=
-=zt8P
+iD8DBQFFs3FmmPFBzbX68WERAtKFAJ9cw4Joj/PdH+5rzieSnPRoNOB49QCeJYAB
+kSKTL2dSKIGeVU5GeZ9+Bfc=
+=WtJ2
-----END PGP SIGNATURE-----
diff --git a/sys-cluster/vzctl/files/digest-vzctl-3.0.13 b/sys-cluster/vzctl/files/digest-vzctl-3.0.13
deleted file mode 100644
index e96a7d077bb7..000000000000
--- a/sys-cluster/vzctl/files/digest-vzctl-3.0.13
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3931ceb56b22bf5e0ad1f9977fff4005 vzctl-3.0.13.tar.bz2 129562
-RMD160 8d161c1249c90d817044c0638da0bbae4d3041b1 vzctl-3.0.13.tar.bz2 129562
-SHA256 c087a6ac18249e9050825fc371b324757ef2ff26de747e25bcaacf591bbd8b76 vzctl-3.0.13.tar.bz2 129562
diff --git a/sys-cluster/vzctl/files/vz-3.0.10.initd b/sys-cluster/vzctl/files/vz-3.0.10.initd
deleted file mode 100644
index 6a7149e8f871..000000000000
--- a/sys-cluster/vzctl/files/vz-3.0.10.initd
+++ /dev/null
@@ -1,263 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/files/vz-3.0.10.initd,v 1.2 2006/07/09 10:29:24 phreak Exp $
-
-depend() {
- need net
- before iptables
-}
-
-check_config() {
- # if we don't want openvz running, say so
- [ "${VIRTUOZZO}" = "yes" ] || return 1
-
- # set default values
- : ${VZCTL:=/usr/sbin/vzctl}
- : ${VZQUOTA:=/usr/sbin/vzquota}
- : ${VZVEINFO:=/proc/vz/veinfo}
- : ${VPSCONFDIR:=/etc/vz}
- : ${PRELOAD_MODULES:="af_packet"}
- : ${MODULES:="vzmon vzdquota vzdev"}
- : ${MIGRATE_MODULES:="vzcpt vzrst"}
- : ${NET_MODULES="vznetdev vznet"}
- : ${VZDEV:=venet0}
- : ${PARALLEL:=4}
-
- # check if you should load vzwdog module
- [ "${VZWDOG}" = "yes" ] && MODULES="${MODULES} vzwdog"
-
- # we need a working vzctl
- if [ ! -x "${VZCTL}" ]; then
- eerror "vzctl missing (${VZCTL})"
- return 1
- fi
-
- # prevent dumb users from failure
- if [ ! -e /dev/vzctl ]; then
- eerror "Missing device node /dev/vzctl"
- einfo
- einfo "Please create the vzctl device node using the following command:"
- einfo " /bin/mknod /dev/vzctl c 126 0"
- einfo
- return 1
- fi
-
- if [ -z "${VE0CPUUNITS}" ]; then
- ewarn "VE0CPUUNITS is not set in /etc/conf.d/vz; using default value of 1000"
- VE0CPUUNITS=1000
- fi
- return 0
-}
-
-setup_ve0() {
- local msg ve0conf="${VPSCONFDIR}/0.conf"
-
- msg=$(${VZCTL} set 0 --cpuunits ${VE0CPUUNITS} 2>&1)
- [ $? -ne 0 ] && ewarn "vzctl set 0 --cpuunits ${VE0CPUUNITS} failed: ${msg}"
-
- test -f ${ve0conf} || return
- egrep -q '^ONBOOT=yes\|^ONBOOT=\"yes\"' ${ve0conf} || return
-
- ebegin "Configuring hardware node UB resources: "
- msg=$(${VZCTL} set 0 --reset_ub 2>&1)
- eend $? ${msg}
-}
-
-start_net() {
- local mod
-
- # we don't operate on a running interface
- if /sbin/ip addr ls | grep -q "venet0:.*UP" 2>/dev/null; then
- return 0
- fi
-
- # load necessary modules
- for mod in ${NET_MODULES}; do
- /sbin/modprobe ${mod} 2>/dev/null
- done
-
- # configure the device
- ebegin "Bringing up interface ${VZDEV}"
- /sbin/ip link set ${VZDEV} up
- eend $?
-
- /sbin/ip addr add 0.0.0.0/0 dev ${VZDEV}
-
- ebegin "Configuring interface ${VZDEV}"
- /sbin/sysctl -q -w net.ipv4.conf.${VZDEV}.send_redirects=0
- eend $?
-}
-
-stop_net() {
- local mod
-
- if /sbin/ip a l | grep -q "venet0:.*UP" 2>/dev/null; then
- ebegin "Bringing down interface ${VZDEV}"
- /sbin/ip link set ${VZDEV} down 2>/dev/null
- eend $?
- fi
-
- # remove all modules we probably loaded on start_net
- for mod in ${NET_MODULES}; do
- /sbin/modprobe -r ${mod} > /dev/null 2>&1
- done
-}
-
-start_ve() {
- local veid velist msg need_restart=""
-
- # get all VPSs we should start on boot
- if ! cd ${VPSCONFDIR}; then
- eerror $? "Unable to cd to ${VPSCONFDIR}"
- return 1
- fi
- velist=$(grep -l '^ONBOOT=yes\|^ONBOOT=\"yes\"' [0-9]*.conf 2>/dev/null | sed -e 's/.conf//g' | sort -n)
- cd - >/dev/null
-
- /sbin/sysctl -q -w net.ipv4.route.src_check=0
-
- for veid in ${velist}; do
- ebegin "Starting VPS ${veid}"
- if [ "${VZFASTBOOT}" = "yes" -a "${DISK_QUOTA}" = "yes" ]; then
- ${VZQUOTA} stat ${veid} >/dev/null 2>&1
- if [ $? -eq 6 ]; then
- if ${VZQUOTA} show ${veid} 2>&1 | grep "vzquota : (warning) Quota is running" >/dev/null 2>&1; then
- ${VZQUOTA} on ${veid} --nocheck >/dev/null 2>&1
- need_restart="${need_restart} ${veid}"
- fi
- fi
- fi
- msg=$(${VZCTL} start ${veid} 2>&1)
- eend $? "${msg}"
- done
-
- for veid in ${need_restart}; do
- ebegin "Stopping VPS ${veid}"
- msg=$(${VZCTL} stop ${veid})
- eend $? "${msg}"
-
- ebegin "Starting VPS ${veid}"
- msg=$($VZCTL start ${veid} 2>&1)
- eend $? "${msg}"
- done
-
- # we're ok even if some VPSs failed to start
- return 0
-}
-
-stop_ve() {
- local veid velist msg m mounts fail i iter pid pids quota
-
- if [ -f ${VZVEINFO} ]; then
- for ((i = 0; i <= 2; i++)); do
- iter=0
- pids=
- velist=$(awk '{print $1;}' < ${VZVEINFO} | grep -v "^0$")
-
- for veid in ${velist}; do
- ebegin "Shutting down VPS $veid"
- # Set fairsched parameters to maximum so
- # VPS will stop fast
- ${VZCTL} set ${veid} --cpuunits 2000 --cpulimit 0 >/dev/null 2>&1
- ${VZCTL} --skiplock stop ${veid} >/dev/null 2>&1 &
- pids="${pids} $!"
- let iter++
- sleep 1
- if [ ${iter} -gt ${PARALLEL} ]; then
- for pid in ${pids}; do
- wait ${pid}
- done
- pids=
- iter=0
- fi
- done
-
- for pid in ${pids}; do
- wait ${pid}
- done
- done
- fi
-
- iter=0
- fail=1
-
- while [ ${iter} -lt 5 -a ${fail} -ne 0 ]; do
- fail=0
- mounts=$(awk '{if ($3=="simfs") print $2}' /proc/mounts)
-
- for m in ${mounts}; do
- ebegin "Unmounting VPS area ${m}"
- msg=$(umount ${m} 2>&1)
- eend $? "${msg}"
- if [ $? -ne 0 ]; then
- let fail++
- fuser -k -m ${m} > /dev/null 2>&1
- fi
- done
-
- let iter++
- done
-
- # turn quota off
- quota=$(awk -F: '/^[0-9]+:/{print $1}' /proc/vz/vzquota 2>/dev/null)
-
- for m in ${quota}; do
- ebegin "Turning quota off for VPS ${m}"
- msg=$(vzquota off ${m} 2>&1)
- eend $? "${msg}"
- done
-}
-
-start() {
- check_config || return
-
- local mod rc
-
- ebegin "Loading OpenVZ modules"
- for mod in ${PRELOAD_MODULES}; do
- /sbin/modprobe -r ${mod} >/dev/null 2>&1
- /sbin/modprobe ${mod} >/dev/null 2>&1
- done
-
- for mod in ${MODULES}; do
- /sbin/modprobe ${mod} >/dev/null 2>&1
- rc=$?
- if [ ${rc} -ne 0 ]; then
- eend ${rc} "failed to load module ${mod}"
- return ${rc}
- fi
- done
-
- for mod in ${MIGRATE_MODULES}; do
- /sbin/modprobe ${mod} >/dev/null 2>&1
- done
- eend
-
- start_net
-
- setup_ve0
-
- start_ve
-}
-
-stop() {
- check_config || return
-
- local mod
-
- stop_ve
- stop_net
-
- for mod in ${MODULES}; do
- /sbin/modprobe -r ${mod} > /dev/null 2>&1
- done
-
- for mod in ${PRELOAD_MODULES}; do
- /sbin/modprobe -r ${mod} > /dev/null 2>&1
- done
-
- # Even if some modules failed to unload (say they were not loaded)
- # we return 0 for the service to be marked as stopped.
- return 0
-}
diff --git a/sys-cluster/vzctl/vzctl-3.0.13.ebuild b/sys-cluster/vzctl/vzctl-3.0.13.ebuild
deleted file mode 100644
index 04328f29648a..000000000000
--- a/sys-cluster/vzctl/vzctl-3.0.13.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.13.ebuild,v 1.2 2006/12/03 08:33:48 hollow Exp $
-
-inherit bash-completion eutils flag-o-matic multilib
-
-DESCRIPTION="OpenVZ VPS control utility"
-HOMEPAGE="http://openvz.org/"
-SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
-IUSE="bash-completion logrotate udev"
-
-RDEPEND="logrotate? ( app-admin/logrotate )
- net-firewall/iptables
- sys-apps/ed
- sys-apps/iproute2
- sys-fs/vzquota
- udev? ( sys-fs/udev )
- virtual/cron"
-
-DEPEND="${RDEPEND}"
-
-src_compile() {
- emake CFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
- make DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/vzctl" install install-gentoo || die "make install failed"
-
- # the get_libdir in `make install' breaks src/Makefile's logic (and thus all
- # contained tools), so we have to create a env.d entry for vzctl's LDPATH.
- dodir /etc/env.d
- echo "LDPATH=\"/usr/$(get_libdir)/vzctl\"" > "${D}"/etc/env.d/05vzctl
-
- # Remove udev files unless USE=udev
- use udev || rm -rf "${D}"/etc/udev
-
- # Remove the bash-completion and use dobashcompletion to install it in the
- # right place!
- rm -rf "${D}"/etc/bash_completion.d
- dobashcompletion "${S}"/etc/bash_completion.d/vzctl.sh vzctl
-
- # Remove the logrotate entry unless USE=logrotate
- use logrotate || rm -rf "${D}"/etc/logrotate.d
-}
-
-pkg_postinst() {
- if has_version "<3.0.10"; then
- ewarn
- ewarn "The location of some vzctl files have changed. Most notably,"
- ewarn "VE configuration files and samples directory has changed from"
- ewarn "/etc/vz to /etc/vz/conf. In order to be able to work with"
- ewarn "your VEs, please do the following:"
- ewarn
- ewarn "bash# mv /etc/vz/[0-9]*.conf /etc/vz/conf/"
- ewarn
- fi
-}