Add patch for init script, bug 449110 by slepnoga.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 52 insertions, 5 deletions

diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog
index 848deb3f30d7..e4383c0c3e0a 100644
--- a/sys-cluster/vzctl/ChangeLog
+++ b/sys-cluster/vzctl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/vzctl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.97 2012/12/13 08:45:38 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.98 2012/12/29 02:25:05 floppym Exp $
+
+  29 Dec 2012; Mike Gilbert <floppym@gentoo.org>
+  +files/vzctl-4.1.1-VZREBOOTDIR.patch, vzctl-4.1.1.ebuild:
+  Add patch for init script, bug 449110 by slepnoga.
 
   13 Dec 2012; Sergey Popov <pinkbyte@gentoo.org> vzctl-9999.ebuild:
   Sync live ebuild with 4.1.1
@@ -541,4 +545,3 @@
   +files/vzctl-2.7.0-gentoo_etc_vz.patch, +files/vz.initd, +metadata.xml,
   +vzctl-2.7.0.21.ebuild:
   Initial release. thx to kir
-
diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index 2e53a32bd4a4..703453b6e7b8 100644
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -1,3 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX vzctl-4.1.1-VZREBOOTDIR.patch 956 SHA256 e0c9c3fda3bb8bd7ef78178bc8f1990c697f4a0c7c294bb8a117d381eb3af0e9 SHA512 caab7e6e1e722448558cf7d5c134c6d1d2e0168d89871b5a0f0c9b532cf6a4c348a42414d1ec7d60ba45ae3ec6f1aa7ea98046be4f10d84c1ece02e9b9a49299 WHIRLPOOL de65e561afebbed04b36017177a9f0865fea24671a08f9c992a664cc16fbed3aeab15a95bc4d7e73ed5e3b2da089d24f5b7c28d4604205fdb2f211bc97b9e913
 DIST vzctl-3.0.29.3.tar.bz2 421448 SHA256 1af2a6c61ee39e9f51128dd1b78b5d1adfaa12b41f74da0276c49102c262d2e7
 DIST vzctl-3.0.30.2.tar.bz2 425118 SHA256 c100914ec10db7cce6114bb8fcfdf67dd406d0547ac07ea8d2994e6ca7299635 SHA512 2487482c96666bf73e961bb2849fafb54463ccf63b44dfbb7c5e6cedc19a7d029bcb66d902d67d1709b8899f61e014d938c150dcfe7b560800710d78ac6cf8f4 WHIRLPOOL 045826e689244d8fc5b60d32a5c0f26ae713693afc3f823b7d5229477db730c25fbea69edeb41de0add55362fc607e09eeb79dedb13d5705f530ee5372bf5c45
 DIST vzctl-3.1.tar.bz2 442684 SHA256 c2b3f37df56613bdd137dbc7d144d146e7f6737bbfae9490458056c7ff8e31ca SHA512 0a49a2a67ec47542a48da6ca43f1fb46d756378cde2453d128d1a8ebcaa7f8814d2a94f0d5dfe9f3e70c72b0aca01704f367d8ffd387bb4afccc2a33b63e5347 WHIRLPOOL fb07e83c2b82d04de0ad9d9cc9f70f733cb97c367d26f8f0862f6626eb2a2e6350cad2f81f9af2fa103b91a4e35075393bbae8174fb09cb8db1e6ccafb0209b2
@@ -8,7 +12,14 @@ EBUILD vzctl-3.0.30.2.ebuild 1616 SHA256 4ba3695d31139f2b4c2828fd6038274f5f5821e
 EBUILD vzctl-3.1.ebuild 1629 SHA256 c75acf1c39a6197260e23301bdc3e90a2e3c15bd74853a2ff86652d1f8dc5ece SHA512 a12f09c174cdb18f81315f4b127242c41af787e23975fca1de2f318c3108c8982a6f8d7c7eb120b5a085ea4ad4e43f3cf57eda0eb82845a6c5b8c444db299d2f WHIRLPOOL 432d967eea2c350b2105deeee158b4c881d0f5ffe4a54525bd13b59b52dc347a3f2f30a58f6a3971dcce0a93d31915a40a7f27e5f0d0d85c38eb30354f2d02df
 EBUILD vzctl-3.3-r1.ebuild 1773 SHA256 69323206a93e38436ee5fa1ea1dfbb073dc29a0b2f167385eaec0d723162b6d7 SHA512 82507078ab387064b86bb945053ec7a50a8754aa1cfc45e8b80bc3603dd0dce68b3b8ab46008967e2119503296f3ca61d5f3eebfbf633b60f2ab71e43bb1759e WHIRLPOOL 793641374925c844bd126895bfb0da3aceb0ad90859cb6718a0c78366af66ff3a255791535518e637e4aa2f954dc6c36b0fbe6bf28df1bf15fd11aca20618caa
 EBUILD vzctl-3.3.ebuild 1703 SHA256 cb4120c9d9a9d4caf212228454cc49b353d0209b620c86bf688aa654dcb3d053 SHA512 752d6aa1651a2656c7da16fcf2fcc662f3fd41f1e83a81b235f4de5e9d3761cf31d00bdd8abc3cacfab8084e78910afed5552edbd02549e72660822d2bac763c WHIRLPOOL e5cda5b715e915e6536323de602464480b2df4dd54a914a703a754b3cd78e78622c15e86d7bba15a05713a08646981641727c04a208c8a8ac16c468717d08cd4
-EBUILD vzctl-4.1.1.ebuild 1978 SHA256 01f4cdd6a6730d07a804913940e93b9ee48ce4f06097435d7fe8e8b2532b8bde SHA512 5144dde34728afe064607501d39cd8fb66922a71f50c951d579163919c445fb61512a7cbb8c5de9242fa8d0edab20e5db5383b6cbf992749bf692100e92ec657 WHIRLPOOL f046657e70913fc3063479378e6c30fb6f09a7219478d3f5134c5e6622f2c47c2d26cb151c70d9d4d5757fac885289e78241acf1c166fd147de5ef94b0cba06b
+EBUILD vzctl-4.1.1.ebuild 2038 SHA256 15005f186c4a3b6697b322c179257eafda06a510c59d229d77fadb81fafa30e3 SHA512 7eff0376cf091d9453a48f5e352b8a80167600a4907005cb810a424aaaf62013bd55e1c93daf6acf56e02e13c9ee0902d677ce06574feff60c0031f3b37956ec WHIRLPOOL 7ad4ddfdbee3e7e19b99c5d44b10f83eb1646207ede85879e2f3842cc0307f1e3cf9d0861042899a15d6dd3f83d135d2d98ad7e7f06c72d4b173200d1b9ded02
 EBUILD vzctl-9999.ebuild 1905 SHA256 bbcf734cadaa6af96855db6cd4b520d6b770fb15b0e37c05460f1bfdab268ebe SHA512 1e90abbb1cc337d724c16564d15645af3a060cbb136a4585de648eb63ed520215b7257a8ace5c1d400872b99f51533150b473d5553dbdef1e831d1ef116cf810 WHIRLPOOL e610bf3738324bccd76bbcb20229e5b277fd446f16f64304b22db269e8c7d37007ed52c040ab0c183b0fa04a1560c074cb71c33191c13ca07c003d8a41655727
-MISC ChangeLog 20298 SHA256 be60704e1ef29c8a2424ecb76219e3aa6335ace317c0e91bd56163f21d950d16 SHA512 bd86b426c3866e53b1002f01d77f90aa86ad680540862e4d6afcd7db5ebcadedb9fd41f64633865dda2add3518d318f6e4871afe94586cbcb200bb8287b88ce1 WHIRLPOOL 394f992b383134d8536547635537283b08b2a08119a3817373109cfd0a9b3f7ac6773a34c476a49ed2e2285ec0e1ffad2bcd62bd8e8eba95560e6b90a6e32ad3
+MISC ChangeLog 20459 SHA256 4c471c2f90d6d337cd71eda9c473f8daaa2c0ddad18c4b5e3f8bce6a59ee398a SHA512 3a202b11363370f17ce5fdc4e969cf785e0997c0958b2ddf5363737155ea3c37fd16f152f3eb2df6692e536afafd0865bfee80faaa7df615de59c3fa0a0ed189 WHIRLPOOL afa28471aec7046318db06c25d8838e62edc4c2009b9d2ccb820db868677b4a00d60371d9af13fc5b2a239f27c16a8dec316992a2c087d2c81f51a4cf5e6ffcb
 MISC metadata.xml 663 SHA256 33959534b64f468d5067d847dc4366a984a7ce9c6bcf701f7cfa44c3f639aa0b SHA512 61aec027e85c81be42306a604252316e92f5e2dd8bfbbd6955c10a6df0b02ccbb54397717fd2d598070c380c712c79b4a2cbfa0ae73ef0673ab8479decda3d3b WHIRLPOOL aa36244bf8ce2dc51fa094a5a38be250d6ba97d03611f3be2495c4095f81f24e54cf539b7bb9f1301abb416f717301e48e1f6c3bf9c39ef30646305628d4cacf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlDeVIUACgkQC77qH+pIQ6TZzgEApbtE4MMwAzKllwCXFaVOmtIG
+kAzwqa7kPg9Rh7CdoQQA/Rn4Vz6zBp8uQM/TzmBukbc4qkRIsuJQBYFwQwiyx4Ua
+=lT7X
+-----END PGP SIGNATURE-----
diff --git a/sys-cluster/vzctl/files/vzctl-4.1.1-VZREBOOTDIR.patch b/sys-cluster/vzctl/files/vzctl-4.1.1-VZREBOOTDIR.patch
new file mode 100644
index 000000000000..c868918b84ae
--- /dev/null
+++ b/sys-cluster/vzctl/files/vzctl-4.1.1-VZREBOOTDIR.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/show_bug.cgi?id=449110
+
+From 9e84e33023a31bc65479784113aad10c69ba0e36 Mon Sep 17 00:00:00 2001
+From: Kir Kolyshkin <kir@openvz.org>
+Date: Fri, 28 Dec 2012 13:31:07 -0800
+Subject: [PATCH] etc/init.d/vz-gentoo: fix missing VZREBOOTDIR
+
+That was pretty lame from my side. Fix for commit af5bf43.
+
+http://bugzilla.openvz.org/2467
+
+Reported-by: Andrei Vinogradov <spamslepnoga@inbox.ru>
+Signed-off-by: Kir Kolyshkin <kir@openvz.org>
+---
+ etc/init.d/vz-gentoo.in |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/etc/init.d/vz-gentoo.in b/etc/init.d/vz-gentoo.in
+index 05ef4e7..2dd2186 100755
+--- a/etc/init.d/vz-gentoo.in
++++ b/etc/init.d/vz-gentoo.in
+@@ -17,6 +17,7 @@ check_config() {
+ 	: ${VZVEINFO:=/proc/vz/veinfo}
+ 	: ${VESTAT:=/proc/vz/vestat}
+ 	: ${VPSCONFDIR:=@VPSCONFDIR@}
++	: ${VZREBOOTDIR:=@VZREBOOTDIR@}
+ 	: ${VZDEV:=venet0}
+ 	: ${VZCONF:=@PKGCONFDIR@/vz.conf}
+ 	: ${VE_STOP_MODE:=suspend}
+-- 
+1.7.1
+
diff --git a/sys-cluster/vzctl/vzctl-4.1.1.ebuild b/sys-cluster/vzctl/vzctl-4.1.1.ebuild
index 048fcd1148c4..89c9d19a0281 100644
--- a/sys-cluster/vzctl/vzctl-4.1.1.ebuild
+++ b/sys-cluster/vzctl/vzctl-4.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-4.1.1.ebuild,v 1.2 2012/12/11 18:17:36 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-4.1.1.ebuild,v 1.3 2012/12/29 02:25:05 floppym Exp $
 
 EAPI="5"
 
@@ -33,6 +33,7 @@ src_prepare() {
 
 	sed -i -e "s:/lib/udev:$(udev_get_udevdir):" src/lib/dev.c || die 'sed on src/lib/dev.c failed'
 
+	local PATCHES=( "${FILESDIR}/${P}-VZREBOOTDIR.patch" )
 	base_src_prepare
 }