Correct xendomains.init(s) to POSIX compliant, fixes Bug #477824

Package-Manager: portage-2.1.11.63/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 21 insertions, 17 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index 3a1ae6977c2f..cacc1e79bdf0 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.171 2013/07/22 17:05:21 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.172 2013/07/23 05:35:54 idella4 Exp $
+
+  23 Jul 2013; Ian Delaney <idella4@gentoo.org> files/xendomains.initd-r1,
+  files/xendomains.initd-r2:
+  Correct xendomains.init(s) to POSIX compliant, fixes Bug #477824
 
   22 Jul 2013; Ian Delaney <idella4@gentoo.org>
   files/xen-4.3-fix_dotconfig-gcc.patch, xen-tools-4.3.0.ebuild:
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 0d811c42fa63..4abdfe5c3569 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -45,8 +45,8 @@ AUX xend.initd-r1 1664 SHA256 6ea8848ca1203c5ef8490014ded86ec67100385c217660d393
 AUX xend.initd-r2 1064 SHA256 b9dcd925856eb5213b9052169492492d686b5d1ccae65b1c94a8ac944708d155 SHA512 e5606c781927624bdbcbeac0b7fb2068078c15abcdc3fb38200ca5ad25d6cb928f6d3451822187c01397d32562c3b9b8a1ed680b4900fa2e07e5600b39ab9dc0 WHIRLPOOL 5fde6ecbe3db47d379f43714a66a45307c13f8aeac93efc026149b896c870cf76dcc01cbb2c41c2bb380830461da26dfae8053d8ae3e7e245ba1e51f6a500c09
 AUX xendomains-screen.confd 886 SHA256 12eb1c354c594e83bdc636d317aff6e84a0767c129a4498d8d2b82964151b534 SHA512 c1e3a5272b3b5624137e37d817247281965795432de0acc0fade9496abdbe918b52dc47dd460384a031d57bf77e39b4a0335f3de5804d415f08028b1e3f69140 WHIRLPOOL 98db1bfb9f87235e816133ce8afa9a9af74017ad75c07860a070bfdaf4bffaec7dac6a2890b5fe15b8f4cde5e79a5eded6135d12c50b51c3c7c8cd8309ea820f
 AUX xendomains.confd 291 SHA256 2fac318bb96b357dd185f7729d83c0a0b941799cdb89c24ed83051bb085735dc SHA512 8ad255d39fc0b390c854a64ed82333b6a3041e1247b7a3934cd8274710c168c0017ef2dddbe32c120268d7ea946f8c1b148d7d06a3a4bf415a77eeec36dce2da WHIRLPOOL cea26f5b0c88d644a8906cb2cc9ea8fe5071d6dfd7fc1020d1ce795a389c01b26209cdde04f61e4755494455a1b60c4652e45734c8f5463f2108ea4700e4f336
-AUX xendomains.initd-r1 2922 SHA256 db121dc218ee8df984da60bb655d4a9b98526a35840225ff86e689363245bcce SHA512 dcbcdf05900493338f3945188bb1e88b61c67ab34861d130eb3146b46c390f76a18186fabd32295a27e49595ebb3bd1b9cff8457e00d90a991f9525bc4fd5693 WHIRLPOOL 247c37d5b3a874b4fea84b0d5a7b5ee790d6ca49307cfd546422441b16b9c32d257873d15a4ba36dec34c9a1b6d40def3ecc7aa11377cc0b0c6ee6cf1f6520ae
-AUX xendomains.initd-r2 2940 SHA256 27480ea1269d988671968aa226ab15910d012e2be8af6ae744fd77baa375d9d2 SHA512 c8e0803191b448a170c72a1556161aa312428ee1685f3ca0991dee7f82667b4a7af48cf6c795a939fcf9c475d712046f8f9aaa6e890bbdbc05c790cc3f7b7b69 WHIRLPOOL acf6496f37664bc6103c2e98bc4c18ec4b9f2f3aec18af0058227f40c13537a91da7bba29d9e0dba71d95a63028dbb4211b4eefc339c52413033b2ea0d42189b
+AUX xendomains.initd-r1 2916 SHA256 75536456bb9ae075ac3ef0f5495e159d175a6d54bbb3581d758a35898f5723bf SHA512 f2747c7e5c25edbd233269ff30014990bfa1243cf9728f02e161de7e93b96f2a9972aa143862a3269238375213b1461e0b8ac6c08673781111b3186c367096ea WHIRLPOOL b1d40c9411128457aff74aa2621e51d92ee06c4b6933c9a747907b93b411c1b9c729f3dee7378c23d9b8d592d975699090e2fbde71d1492a5f35bb8df54610de
+AUX xendomains.initd-r2 2935 SHA256 779c29e02998d3a065d2bf62d4cebafd62be3202e2a1a1a73261ef23c9e80081 SHA512 ba712a20117ddf05557b86e74229b361786e070c7f9f8910be827a983c6ebb05c5b50174eaf90e59745803f4dcd8696d1803be6321b273351e23a154c4146503 WHIRLPOOL ffcf84e2df303d040038dbebb7469dc9e0c4783005ffcf4a3dff7a958d089c5d0a337f20815b35b1377a4b489b0050cfc219b337f867e3ba0f41e98d51d0b7db
 AUX xenstored.confd 42 SHA256 afcc14f014fe4ec478f85d230efefba9ffad024bf8c83b30074e8a3712cc7831 SHA512 0906cbcdc84935d07cf53bc4447a1f9a9dc4e4fb9fda9a7163f6982f1d8a3ada1f0650fcd254fb6f715a54f7971daf0a5e61c3de6db70dfd156156fd55b59fe4 WHIRLPOOL df46f3fde8b13c3427f445bcf08eb4c660f6000164a01e461cff85cf93ce1195009fc3b4457181788da8eef8dec9125b41ace233ec6f169919be64337a57ebb8
 AUX xenstored.initd 890 SHA256 c58c18707b20acff76fed8252c8e81e30a8a06a376945856a1f9593c5f60dd53 SHA512 00316a324916a6c605017cc8521f371d0c28b1be0fabdabe125e418975df852fc3b679a3bf3725cb3d668024ce62937a8149467d3349dec114d15f17f79d8376 WHIRLPOOL 3492fd6113c3f976fa636ea0ec671a0375e0e55c43ba849b280775fc256f9155f0f4804878af050ca7382b6b9ccc4a8cc449bfb535ff145066ffac0f932d4df3
 DIST XSA-55patches.tar.gz 23888 SHA256 e86749d02ca5594ebcfdaea820a6cf1fe11015c7fdcc5836260498fae317d75b SHA512 ed1f321a1351df99cfb05e1dfc62dda1268544b0c0ceb7a01438805046e027fb9d59194d179b7a8c302b091a7bf444811b0b9359c4d42f7e902510515c275b6b WHIRLPOOL 5a611e5260f0fc97471f386da3499f7714e015c5c2556bd7199466558d8e375784d32655bdbe9ed4cbf492fa3b41091677d9fe6d3714b029c9a2b1dda6102edb
@@ -60,12 +60,12 @@ EBUILD xen-tools-4.2.1-r5.ebuild 12036 SHA256 4bfc80545588022891c5c4fa752803887c
 EBUILD xen-tools-4.2.2-r3.ebuild 11753 SHA256 9b004f7a79b6ed309d6ef6c311281cce19946d8fe3d7af6017efad098847d38a SHA512 d65b1935abb7f37b26dcb654d721029b03afdd3b66531b64474c3b1ce0c6b757ca315336bdd1c0ca33948226a3630dec717aef1ff612c8d028747fca8369b4bc WHIRLPOOL 25a6e33e01c3e857e3d312b1af39ea7a83e76682f8398027a32a495259d874d1dd545cd9b4729a6a4b2c34ab9a672da904e8b8820f7ff45061452212d42fa63c
 EBUILD xen-tools-4.2.2-r4.ebuild 12035 SHA256 e3fc7b81f790fc2ab4e88a958496c919251b3dd93f5d36232bd8a4b8669f58aa SHA512 96f45720cadc4cd3953da898ea6e13b0940ab0bef783f56356e6cbd7d84d40113df41dcd99992bf8de386401d84a02178b6dd8da0107c64138743e0617e8616d WHIRLPOOL 05239ef6487d09e868d00954b2d5bf9c9592874c628a8989e44d6d7f64bcba9b30961d0700bc1da0fae70baaba621ec5a85c66164313b376b644b59275600165
 EBUILD xen-tools-4.3.0.ebuild 10740 SHA256 cd0d849cdc562cd380cc396f3383b4a6d971c8ea6c243d281c2580596382021f SHA512 55e0c7c6da777ac5ceb862aa874c86f8f014596b965f3d1db7f347dff8404cf8fd530bf3812fa508bde3a9bcc00802c7a554a5136d2b04a1bc8118c18cb923a8 WHIRLPOOL 256b6037353ca019bf73448bc430bea2d15db71dd935adc6af2633a5d22751dbf19cbffe32e706852d548e84218c304de93ba63b0361e6bde1a8419d48419b53
-MISC ChangeLog 41937 SHA256 537ad8196c61d33f315c8cd64178c0102e1d3230bab927b95a454c3f0ea163e0 SHA512 061e08ff11c49c6121cd779ce73732d1eee37c44d3c5e7b44436e1e261e3ca00e3b340bee040d8d6f08b9bce620be308f680f9ff9a2f25c7ca87c019483bc0e9 WHIRLPOOL d95f548c35733e6d622bf92284fd01419a926bdcb0abf7b13087d6e5873ff845ff74a5dd646911b25882bcd6f992076a7965347b75d4aa0e2899d9cf97cbadcf
+MISC ChangeLog 42109 SHA256 c414dbfcea366eaf74a96a19e80171bbe23b24168282b5ca03924d03762d14f8 SHA512 23031df85e83caf72b54893a55363a0792a1b503f22755df845cd54d4ace8434ad5ff24b4608c5f72fc1e56c0c524198086afd69ecbf56ef3615c36dba9011ac WHIRLPOOL 025f873cbe5236941220ae5fbd9079700861abdf4e067a6de050057bb92bc8ea19e172cdb2a0f7103c0c920afb5dd15cd0d9af975a00f1aa8dc223d12c9b8cba
 MISC metadata.xml 881 SHA256 52d19c65a78ed979b0d6df2f83fc281e8622296e2686c199dbc58cb76a70a57b SHA512 3e2400037f840272c38b0a7b9d46f9975d512bea13e6dc21bf8458fb68b1c741f4458a9eaf18aa53c3183ef4f83e70e8ae50e28132e563fc4a1d6463c77a586d WHIRLPOOL 3b030061503f4c2beec7f51d3bf790f358a4837d78d7a0faf0eee5214832fe888445a53c0b09b94bf8dd811e44523e0bb05535d58583499df97b32280f722312
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlHtZm0ACgkQso7CE7gHKw1fOACeL/exq9FMIZoNzGm4Bs5AJ0D7
-rJ4An1pYTFozoKxYM54VU6YTodCK9PtY
-=fimA
+iEYEAREIAAYFAlHuFkYACgkQso7CE7gHKw2a0wCgk7z1XL7qFqeeako9AoAmyULv
+KGMAniWPy3qCcsHR5+eYKGHrLnGBwp4l
+=yIcx
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen-tools/files/xendomains.initd-r1 b/app-emulation/xen-tools/files/xendomains.initd-r1
index 248cf6cd2ae7..e9a117878f55 100755
--- a/app-emulation/xen-tools/files/xendomains.initd-r1
+++ b/app-emulation/xen-tools/files/xendomains.initd-r1
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xendomains.initd-r1,v 1.3 2013/02/24 10:39:11 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xendomains.initd-r1,v 1.4 2013/07/23 05:35:54 idella4 Exp $
 
 extra_commands="status"
 
@@ -13,7 +13,7 @@ depend() {
 get_domname() {
 	local name_from_file=$(sed -rn 's/^name\W*=\W*\"?([[:alnum:]_\.-]+)\"?\W*;?/\1/p' "${1}" | tail -n 1)
 
-	if [[ -z ${name_from_file} ]] ; then
+	if [ -z ${name_from_file} ] ; then
 		basename "${1}"
 	else
 		echo ${name_from_file}	
@@ -25,7 +25,7 @@ is_running() {
 }
 
 using_screen() {
-	[[ "${SCREEN}" == "yes" || "${SCREEN}" == "YES" ]]	
+	[ "${SCREEN}" == "yes" || "${SCREEN}" == "YES" ]
 }
 
 set_screen_cmd() {
@@ -45,7 +45,7 @@ start() {
 		&& ${screen_cmd} logfile flush ${SCREEN_LOG_INTERVAL:-1} \
 		&& ${screen_cmd} log on \
 		&& ${screen_cmd} deflog on ) >/dev/null
-		if [[ $? -ne 0 ]] ; then
+		if [ $? -ne 0 ] ; then
 			eend 1
 			return 1
 		else
@@ -76,7 +76,7 @@ stop() {
 	# Stop all domains with config files in AUTODIR.
 	DOMAINS="$(ls "${AUTODIR:=/etc/xen/auto}/"* 2>/dev/null | sort -r)"
 
-	if [[ "$PARALLEL_SHUTDOWN" = "yes" ]] ; then
+	if [[ "$PARALLEL_SHUTDOWN" == "yes" ]] ; then
 		for dom in $DOMAINS ; do
 			name=$(get_domname ${dom})
 			if is_running ${name} ; then
diff --git a/app-emulation/xen-tools/files/xendomains.initd-r2 b/app-emulation/xen-tools/files/xendomains.initd-r2
index e225b76ba572..e4d4dba1dc7b 100644
--- a/app-emulation/xen-tools/files/xendomains.initd-r2
+++ b/app-emulation/xen-tools/files/xendomains.initd-r2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xendomains.initd-r2,v 1.6 2013/02/24 10:39:11 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xendomains.initd-r2,v 1.7 2013/07/23 05:35:54 idella4 Exp $
 
 extra_commands="status"
 
@@ -13,7 +13,7 @@ depend() {
 get_domname() {
 	local name_from_file=$(sed -rn 's/^name\W*=\W*\"?([[:alnum:]_\.-]+)\"?\W*;?/\1/p' "${1}" | tail -n 1)
 
-	if [[ -z ${name_from_file} ]] ; then
+	if [ -z ${name_from_file} ] ; then
 		basename "${1}"
 	else
 		echo ${name_from_file}	
@@ -25,7 +25,7 @@ is_running() {
 }
 
 using_screen() {
-	[[ "${SCREEN}" == "yes" || "${SCREEN}" == "YES" ]]	
+	[ "${SCREEN}" == "yes" || "${SCREEN}" == "YES" ]	
 }
 
 set_screen_cmd() {
@@ -46,7 +46,7 @@ start() {
 		&& ${screen_cmd} logfile flush ${SCREEN_LOG_INTERVAL:-1} \
 		&& ${screen_cmd} log on \
 		&& ${screen_cmd} deflog on ) >/dev/null
-		if [[ $? -ne 0 ]] ; then
+		if [ $? -ne 0 ] ; then
 			eend 1
 			return 1
 		else
@@ -77,7 +77,7 @@ stop() {
 	# Stop all domains with config files in AUTODIR.
 	DOMAINS="$(ls "${AUTODIR:=/etc/xen/auto}/"* 2>/dev/null | sort -r)"
 
-	if [[ "$PARALLEL_SHUTDOWN" = "yes" ]] ; then
+	if [[ "$PARALLEL_SHUTDOWN" == "yes" ]] ; then
 		for dom in $DOMAINS ; do
 			name=$(get_domname ${dom})
 			if is_running ${name} ; then