Added xendomains.confd to start of xendomains-screen.confd suggested in Bug #455622, edited xendomains.initd-r2 wrt suggestion from Bug #455626, fixes both bugs by Tomas Mozes

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

5 files changed, 35 insertions, 9 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index d850101f56c5..9a3bd12b98a1 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,12 @@
 # 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.134 2013/02/03 21:36:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.135 2013/02/09 07:14:00 idella4 Exp $
+
+  09 Feb 2013; Ian Delaney <idella4@gentoo.org> files/xendomains-screen.confd,
+  files/xendomains.initd-r2, xen-tools-4.2.1-r1.ebuild:
+  Added xendomains.confd to start of xendomains-screen.confd suggested in Bug
+  #455622, edited xendomains.initd-r2 wrt suggestion from Bug #455626, fixes
+  both bugs by Tomas Mozes
 
   03 Feb 2013; Agostino Sarubbo <ago@gentoo.org> -xen-tools-4.1.1-r6.ebuild,
   -xen-tools-4.1.2-r3.ebuild, -xen-tools-4.2.0-r2.ebuild:
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 9e9c3f046b21..73fd36fbf1cc 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX ipxe-nopie.patch 964 SHA256 0b70407969735f36587fade77f524c1c2077f28585b9e0df4fe347ecc5e379bf SHA512 510f0d88cf08a9a963c0ccf32e795e98f89e749f746ea244b29d7af770608287d8218b215ee46d73ec4f727d6dfbdb316048c6b42df55a8e154aa952abb50c1d WHIRLPOOL 38ed76955d51e9c4603a487e34340df7392e3011e5b2ed550bd945727733cc3f02691c6e0a58ecbe0dd56377a5b6a955a1516647c49cb85dfc809c852ede9e38
 AUX xen-4-CVE-2012-4544-XSA-25.patch 12691 SHA256 2bbac6a09946722fc082124870d750a6b9ab93ea3166bf50faee717acf03d70b SHA512 e911636808ecb08510821bf18ba7807485f2b4b7288966349d40cb4091eeafbc5d9abbee5bc26f04dfe5f3157e9173d1820d1e3b2b25d1e678358ad8d5b2f901 WHIRLPOOL 48e08d9900536a65193290dd4e802a64c33033414ef55823ef21806905ba448bd4c57af4102752172035c0572c431f280f84cf362007911cb1ba2573d4379749
 AUX xen-4-CVE-2012-6075-XSA-41.patch 1393 SHA256 6aa21c02e94cb9b4f612c7a9d1a8f980967692b1f20346da9670abb1d7ec688c SHA512 547f63e7eaf0a6db1a9de267cc6f9aa0f28e2221f2c69ca463ada85edbc07ac84c276dcd3ee017ab8846d4e4129e182fb76be35b91ae9a0e0afecdc091e0c305 WHIRLPOOL 848359780edc15895a09bf76afeaa503f907ac98a856b52d64ef4dcb137e2319222a47cd7a2866e6f25731498f487cfca2a462fb6dfcda8404026d8acfff5bcc
@@ -18,10 +21,10 @@ AUX xenconsoled.confd 44 SHA256 2a74be03eb74f6013242a4a5d721df6cb9b959b43c405de1
 AUX xenconsoled.initd 652 SHA256 1a5594e4e924b94490c5c942b1b63e5fe857b8ad8061060e5d8a3bdfc9f0f1b7 SHA512 7caba575ecc1bb7263539142fa087ec788c583128d7c5236c1fd342d06a238edbb0aaf0ea53ce6189e72cf4402dfc07205db477840e3fa7233b3a6f9a231c2e4 WHIRLPOOL bb58d60a7ee646b59fb1272143c8fcbef191d9f4d90fb933d8789c37f7c28d6b63e81c616f870456fe84f12402753edf3af637d4fa37e425049570824035d805
 AUX xend.initd-r1 1664 SHA256 6ea8848ca1203c5ef8490014ded86ec67100385c217660d393b25dc6519d254d SHA512 ec0b1728bf60427f28f5e649bb3e67f8aa3539a1681f0cdea33d021131a84c8eecbf4caec73eda32f3face610c46aaf3f4b0585129111670569405c2cc4d2843 WHIRLPOOL db4089bd831e2b1e1d2abe8ec07bcf6d229a50f06df16de836ad3b0d0a594fc7776f514cee14ee088172a2ea611f12ee16c1d02f30be48fc9ba9fc58482b9652
 AUX xend.initd-r2 1064 SHA256 b9dcd925856eb5213b9052169492492d686b5d1ccae65b1c94a8ac944708d155 SHA512 e5606c781927624bdbcbeac0b7fb2068078c15abcdc3fb38200ca5ad25d6cb928f6d3451822187c01397d32562c3b9b8a1ed680b4900fa2e07e5600b39ab9dc0 WHIRLPOOL 5fde6ecbe3db47d379f43714a66a45307c13f8aeac93efc026149b896c870cf76dcc01cbb2c41c2bb380830461da26dfae8053d8ae3e7e245ba1e51f6a500c09
-AUX xendomains-screen.confd 594 SHA256 c4d7ffcdbeccc5e93460e2abbf70d642a78a363d79ccbbce0407f50cace54e0a SHA512 7b1adc6737a7708fb2296d612b40fc92b7068cb2c53eff9883b7baab3c66c8a0df5eb00e2dba64cd80c4e7f0d3e553225571a2815bf99cb6a3bc7825f72a5678 WHIRLPOOL e05f0507ea7729f1ec482adaef9aaf093d27857f17aa6c50422c0677300b1fa901432629134881649fcc4e3b76f971c845136054bb55e851393818bc4fbc625b
+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 2930 SHA256 cf03eb7d8eb6d79bce02e857a4a6bcff68a6a63c55ff283f18ebb8d013a27111 SHA512 7a7883d0042ed1fb1e37ebd0424a2d9df0682d7282d80346a486cc119100bb74f1642c2f65a479003f7c4de495f2394246a0fb31169813d311f9ff73aabd3093 WHIRLPOOL 278ca5a266026778d5bb2a376c51de83d46dfe4efa6e2ae3fd8a22905c504d750bd12ba2120323e2266259eb4529f84689a98e3fa125ccdf654f8ea6e28ee67e
-AUX xendomains.initd-r2 2933 SHA256 b6ae8d87c5e7871ba4a282a08603093b75797c8fbd7788d4b77000dc0c296dbb SHA512 0450c5e97535281a24f9087176e199b134967b3dafff481283effb89600a9db36537d323b6e8bc4d60f9b37cdf54d6552be827eb837cdbb99960d1a93e4b0441 WHIRLPOOL 99141f1f4c564c74e052555de65da045011c3f3248e4dad3a64bde7b507b2e928d4b6f2fd864cc2f1a8c61b1ff5330c15046e25bb80e75bfc52cc895dd9ae5b8
+AUX xendomains.initd-r2 2949 SHA256 8f4dacaf4e88ff4024163c11986645bef1e32534d0b8b1cb7cc8ae75ee3036a3 SHA512 58f1d9c6e3234b9e3b9e8f7d43ab6947234b876759c12d5ee4ce0ba6c0ee052db53606b461b5ba5acca3a8f9ae11920141fa734f96744cc7db51e82e2556aac1 WHIRLPOOL ffe5405eb0fe3b138ce9dc833fcfbf13d2292221925460c6fa422a0305fdcad9116b4d9ca5284afc915efade2e0818a6eb3d5dfaa0316533de5c9a9f78b47e91
 AUX xenstored.confd 42 SHA256 afcc14f014fe4ec478f85d230efefba9ffad024bf8c83b30074e8a3712cc7831 SHA512 0906cbcdc84935d07cf53bc4447a1f9a9dc4e4fb9fda9a7163f6982f1d8a3ada1f0650fcd254fb6f715a54f7971daf0a5e61c3de6db70dfd156156fd55b59fe4 WHIRLPOOL df46f3fde8b13c3427f445bcf08eb4c660f6000164a01e461cff85cf93ce1195009fc3b4457181788da8eef8dec9125b41ace233ec6f169919be64337a57ebb8
 AUX xenstored.initd 812 SHA256 8f9df8ad835e45f9c995244e9e80d1a9ee630787bf2da88b7c4a73354d056fd8 SHA512 df1d7abd22161f8048b2491b0852af4b2a19590f8b608f28b67e4a76ee18333b12ab25a227d10e6104c39fa507fa17694e8bc42cef676ef6a1cb57231f45cc38 WHIRLPOOL c5f987f4505940c42589b850bfae74d3c20c03d2a054f1a75d33c8037b6c722b450b724b2c8801983bce46fae896885882b41ac9e975ffd333b956028a51e4e7
 DIST ipxe.tar.gz 2867999 SHA256 632ce8c193ccacc3012bd354bdb733a4be126f7c098e111930aa41dad537405c SHA512 c5cb1cdff40d2d71fd3e692a9d0efadf2aa17290daf5195391a1c81ddd9dfc913a8e44d5be2b12be85b2a5565ea31631c99c7053564f2fb2225c80ea0bb0e4a4 WHIRLPOOL 58b7459aaf7323968e2f4d1cdcb563a04a0ee40d7d0e8fc600495baf6914127fbbbcddfb66199cd9f462eb59565b3d1ae90a05b3c771b8f13c2d2dcb6070eebc
@@ -29,7 +32,14 @@ DIST seabios-0-20121121.tar.bz2 2199282 SHA256 f7f67181c6c0b4cea3a9db48e2569fdcb
 DIST xen-4.2.0.tar.gz 15587687 SHA256 43f4a086e4e0330145a27b7ace8365c42b5afbc95cefadafe067be91bd3e5cfb SHA512 4fb56c79d722fb307bc657f16d02079c6636427e7650c4354193632d38d2d1db8e588f844ff0ca6e757c108ed639a528565ec9fc7c00bb4d5b6fbc9d122d8a70 WHIRLPOOL 369a109375864cb61920b56cf501522051d28513e738f0fd0e7b76244c3e08a8a0a6ff6cf245872d9bbd9c0f22c7da76c9cbc0f852bad6108ca25fd42dc677c0
 DIST xen-4.2.1.tar.gz 15593695 SHA256 fb8df5827ce3e2d2d3b078d9e5afde502beb5e7ab9442e51a94087061bd450c6 SHA512 fe27a965e2b34035bd025482eda9fc4d4e82523c929323fd30813367d5ffbe2fa1ed3d7d4479f2632e8b5625972448b7bd6a7768e8dc1dcd1b6747d281cc1a9e WHIRLPOOL 226bbed059541e804f1a44e721023ffbc04bae43000653b1d7d6a9bfec0d9efbf7a48b1b0a7ad3fcb8e34f8b91e1c620c2a8eddf97baad487e9db37d49a58f37
 EBUILD xen-tools-4.2.0-r3.ebuild 10011 SHA256 c9a32dd324c3f84a2165348a5ff680f64143a38f294099de21bc6825e8c923e4 SHA512 d62db642df252dec84edbe2f9a09b70c54327e5f284137cebcbee4f553c0254e641c1cee08e6e882f13236df34b22faf93f3ac142b7b9090de5cdb6f0eea34dc WHIRLPOOL ea5c901e03ccaeaa3ed91b1d609809a63a132322c7b2c4c9cdfc9a0ba1628557c99f7ac0b30ead4e0423ef3016083050fd1e5dd011d4355ae87dc75fbd56a0cc
-EBUILD xen-tools-4.2.1-r1.ebuild 10044 SHA256 83c6637eb28319366e356af2702ecf77e630e6e11fd2b3ba7afdea1c0eec8546 SHA512 c8681f2b2274d8232cf950842ab6423405be6f16215686de49651ff0ce675d68dd8fefdf3368d53c2f05bbc4e9f53011aef34aa8b3b36f9bdb2ebf9831b2d853 WHIRLPOOL 1af5c3ee2f91a6c4291e571c771f402c772e94effd95eb0faf920154585ed9f9cba3a48b2b027f113bb88b27fdc703abebd2041498f05b96ba0de7a71b2685dd
+EBUILD xen-tools-4.2.1-r1.ebuild 9994 SHA256 93ebfd630c16c1d94ebc831c9f8f4c89b3bb11bb0e6ac992897b5f20622c4c5f SHA512 866f88526b6d12a7808e2684422c8b42aec0c47ed3cb34e0335a4961a6d3121b6c7ff5f50cc6ff19eb6db71c13efe90d8ece4aa2754f158dc8685d9ee9cbe4a1 WHIRLPOOL a22dd59c08cec8b2fbae411253722184af6a0692a46afa7e141b1e81466d3a16550ac73a803f00451a284100f7810be929055fabf4196459fae1feda282918a7
 EBUILD xen-tools-4.2.1.ebuild 10279 SHA256 763ee5f7cce3cc7e55b7e3bab4d271c03115000053c809793ec30a14ad6681a4 SHA512 c91f648bce05a476780267cf2839431e200944bb4d9379f8cd9370b91ec241df2c29d119e4b4160f4802949a03bc2b93f2c837187325d9b72f0a573d3a951e03 WHIRLPOOL 88aa1ec2beb59fa5b62f88cd711a3823dbeebfca22395d12445e587c87e1de11333c07f9e0535b0e61ccb5403d75ea562f4e4759fc7f1a81489634061e22f852
-MISC ChangeLog 32841 SHA256 36e970d5b4b750359b565e40205d7bb1cf278fbcdd896166cba6e01c60c3a15c SHA512 cd0030e658dba1b798d6d69038a5fa822d0ad7b9584c4ff1b651027253bfcf4e8b333df30a56de0342201cb28caa37af1505c5443fa3e5d895b45370d1ac3685 WHIRLPOOL c5461b88b9ef4de37c95fc27d41df2e142a0fd8c8b0e251edafc2cee55c662f8c121be0625c19b9b286dfed56a158befd4c686d818a0cc53c3a71758516eb405
+MISC ChangeLog 33163 SHA256 2c15590c9b52c3dbea7de0825f7bcc51c6ff7cee1561e8dfb7bb5423b34006f7 SHA512 bd8ed83258540e8b0eb2d4d7fdc3b721c62c83d4a6a869c16836f949d143a4df1736df65959a175acad550313785943e03aa320cfc6fc7ae3e1e0955e87db85a WHIRLPOOL a92b3e9ab72d0356b779f7102f241716d140d8da238b58b9cbfd8ff94465eadea033818579577f37121e5b37d11d929a1c76a8b9823c44c43273b6fa1eb8f296
 MISC metadata.xml 881 SHA256 52d19c65a78ed979b0d6df2f83fc281e8622296e2686c199dbc58cb76a70a57b SHA512 3e2400037f840272c38b0a7b9d46f9975d512bea13e6dc21bf8458fb68b1c741f4458a9eaf18aa53c3183ef4f83e70e8ae50e28132e563fc4a1d6463c77a586d WHIRLPOOL 3b030061503f4c2beec7f51d3bf790f358a4837d78d7a0faf0eee5214832fe888445a53c0b09b94bf8dd811e44523e0bb05535d58583499df97b32280f722312
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlEV90UACgkQso7CE7gHKw0dDQCcCgeHzmgfK7fM4VIo/m9H+5I8
+rzsAniOEHoXbcWvO73MfDsa9f0WISim/
+=gWpv
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/xen-tools/files/xendomains-screen.confd b/app-emulation/xen-tools/files/xendomains-screen.confd
index 1482c0a25041..a180c13d85db 100644
--- a/app-emulation/xen-tools/files/xendomains-screen.confd
+++ b/app-emulation/xen-tools/files/xendomains-screen.confd
@@ -1,3 +1,13 @@
+# /etc/conf.d/xendomains
+
+# Directory of domains to boot. AUTODIR should contain one or more symlinks
+# to domain config files in /etc/xen
+AUTODIR=/etc/xen/auto
+
+# Send shutdown commands to all domains in parallel instead of waiting for
+# each to shutdown individually
+PARALLEL_SHUTDOWN=yes
+
 # When SCREEN="yes", domains in AUTODIR have their consoles connected to a
 # screen session named SCREEN_NAME, with output logged to individual files 
 # named after each domain and written to /var/log/xen-consoles/ . These files
diff --git a/app-emulation/xen-tools/files/xendomains.initd-r2 b/app-emulation/xen-tools/files/xendomains.initd-r2
index 5113ae627be2..e88e576126d8 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-2012 Gentoo Foundation
+# 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.4 2012/01/12 13:40:01 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xendomains.initd-r2,v 1.5 2013/02/09 07:14:00 idella4 Exp $
 
 opts="start stop status restart"
 
@@ -39,6 +39,7 @@ start() {
 	if using_screen ; then
 		ebegin "Creating screen session to hold domain consoles"
 		(  screen -c ${SCREENRC:-/dev/null} -d -m -S ${SCREEN_NAME} -t dom0 \
+		&& sleep 5 \
 		&& ${screen_cmd} zombie dr \
 		&& logrotate -f /etc/xen/xen-consoles.logrotate \
 		&& ${screen_cmd} logfile  /var/log/xen-consoles/%t.log \
diff --git a/app-emulation/xen-tools/xen-tools-4.2.1-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.2.1-r1.ebuild
index 9d281472f945..2a0151404f1f 100644
--- a/app-emulation/xen-tools/xen-tools-4.2.1-r1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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/xen-tools-4.2.1-r1.ebuild,v 1.3 2013/02/01 13:24:26 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.1-r1.ebuild,v 1.4 2013/02/09 07:14:00 idella4 Exp $
 
 EAPI=5
 
@@ -32,7 +32,6 @@ DOCS=( README docs/README.xen-bugtool )
 
 LICENSE="GPL-2"
 SLOT="0"
-# TODO soon; ocaml up for a potential name change
 IUSE="api custom-cflags debug doc flask hvm qemu ocaml pygrub screen static-libs xend"
 
 REQUIRED_USE="hvm? ( qemu )"