bug #498720, shutdown all domUs

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0xAABEFD55

4 files changed, 31 insertions, 127 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index 49cfe1acabec..fb4b27b1f4d1 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.211 2014/01/02 04:58:54 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.212 2014/01/23 03:38:35 dlan Exp $
+
+  23 Jan 2014; Yixun Lan <dlan@gentoo.org> files/xenconsoled.initd,
+  -files/xendomains.initd-r1:
+  bug #498720, shutdown all domUs
 
   02 Jan 2014; Ian Delaney <idella4@gentoo.org> files/xend.initd-r1,
   files/xend.initd-r2:
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 9ba741ee7209..0e27b82d05f0 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -51,12 +51,11 @@ AUX xen-tools-4.3-ar-cc.patch 4036 SHA256 1470887a8ced12d8df61ef74d6dfcb36f2822f
 AUX xencommons.confd 109 SHA256 e19b950b1bb4103f9006a0c2648a8d4bc890e2c67417de2700b82fb456802640 SHA512 f0bbc9647cecc6cf806e3059960fbe39b23304d9ca0955fb261e1d320b9b9ce59e5b28cc4b5a9922295b31221f0cd8f0cccb405520e097a7b12dc6ddb3294c17 WHIRLPOOL a8b7df6f9a8515b9c3c845379a3aa4424490972d5f882e8779a30fd2d44b77cb66deaa5c1496125ea7bc82e06044a485e14e904ad5c9c79222c008fb6ccc4e74
 AUX xencommons.initd 1572 SHA256 1798da5d488097792b6d2d42970309a4f6dad5a14b3104de66b44b7d07f0a5c3 SHA512 32407a6e075dbbead800b49c08db1786b9ff667dc7e3297a58ce620c200826d38955f19ec622fb6526c96615adb167c53cf34828bbb63aba40a7b24b41513382 WHIRLPOOL 29a18b9778e5c2c411f7a20381f5a9f8d1f5e99f6bdfb850a585ee21c88f4d5f678550f74ea4aee15cc8dc63db3d58564afa5480effc77e21fd89482ee560e0d
 AUX xenconsoled.confd 44 SHA256 2a74be03eb74f6013242a4a5d721df6cb9b959b43c405de1e32813f52d749060 SHA512 30df69cc38d0bed26bc4d6e08a2b62cbdc654d5f663009a05cb3b83b3e3dc5e206362d3fd59abbb753ceb8d6d79eaa6e15d079bb8f4f35dc74667103faf4e85d WHIRLPOOL 503f7b48842724e69e7e4ae752d0570c339b7214b5a5fa1db51300e65470803bb383524f6de6c5c08849a961f628f6db7764e3eddcc19accbd209777a0f27d68
-AUX xenconsoled.initd 641 SHA256 eac97dd56d94e725311e10321a960fe75c0d21a567c64abf3836d5b9176e5bf3 SHA512 138362ae64b583f1b92e3fca63a90ab23b959e7de7f69fcffb63acc319967f59f0fdf5204168585fe095ab3b644443c0251a55740a9d3bc18b39f4d91dd7a0d1 WHIRLPOOL 6be3fcfed465f2e398e9a49d232415b38021ad5d4e11eab816a862d6d8d508d149a8e8a40b014972bc8381a6a4f31c36c9e9d254d947f192e332543d79259c4e
+AUX xenconsoled.initd 797 SHA256 d9a2499f8f2c711661e25c652d0b2c8a8c02c844dcc8db0fa393fc994a92c3b1 SHA512 419c390bb03f346ea3f90a701425e89b20862e2028f730cda65a6050304a8d5d34928e74ef46d4ec4e3d8f5ee081ac9dd3b170ebbf46d362866bf6a69ebc479e WHIRLPOOL 49cb17ef8626b012006ceb3bda19bff8072307e736c31baaf00f9374c24ef477b8f68bad6d1595f3d6c943c3e7bfb2cc6b376ba85e0574a41bbbcc93aa15a273
 AUX xend.initd-r1 1654 SHA256 66288cbff2fcb457778e6dd5ea4edb0dd99b491a53f8cd0eb799950e7a07c361 SHA512 6ae729898c5d6104b82220e4ba9ec321615500e332ed82cbb981fc1dc2e86f897520de688ed3ccd02fb8369d64705f4993f4730836f85cd8824d3aa2f34f1f6d WHIRLPOOL 2d39bcb96e0f41078612d1f528bcc7d192ee547ede1ef8fdb48bac37500a066070910ec265fedd5767ffdd5c1d7e29deed2a50442274c8d4d1080ed43b844c07
 AUX xend.initd-r2 1056 SHA256 d316338c06679bee39c2b378f2f4b5daa738d82206f80610e8ca874c797f265a SHA512 be835ff131a2845b003f0ba2b94959fc940a9db3e60f4325565317701440bb4cb6ae08e0e407b4bdbb057957541439e3b92ac7abb129d50304c14e3d180a34d4 WHIRLPOOL ccfb1abf6d6b508091600f3d99071d2143a34f5bb64d170912b8eeeb536da758c2295f19c727edb0ee86e1a38ccbdcd43e5297ea06058c539ea66fd578bcd43c
 AUX xendomains-screen.confd 890 SHA256 10ae16108a73cc1ddecfae3bd8dc0e7e739f3f9d845249a2ec23ca03ea02fdb1 SHA512 fb7bfc1806608c6e30bb7db367afe9cf75d44e809556c3ba2794cb3ce0c9f35bcfd7f2bfc4a15a8d805f3d57ff082fe9a525cbac3306e64cbbd0ee5cef554505 WHIRLPOOL 014bef2bf120733482a54811f97ea680ce4d585df1cefde96a0ad90de1e167986f8ebdc0726717128c5835b8f8d55eddef79a36ab86e39ac2a43be70562eeb07
 AUX xendomains.confd 291 SHA256 2fac318bb96b357dd185f7729d83c0a0b941799cdb89c24ed83051bb085735dc SHA512 8ad255d39fc0b390c854a64ed82333b6a3041e1247b7a3934cd8274710c168c0017ef2dddbe32c120268d7ea946f8c1b148d7d06a3a4bf415a77eeec36dce2da WHIRLPOOL cea26f5b0c88d644a8906cb2cc9ea8fe5071d6dfd7fc1020d1ce795a389c01b26209cdde04f61e4755494455a1b60c4652e45734c8f5463f2108ea4700e4f336
-AUX xendomains.initd-r1 2914 SHA256 95b50886c273ab6c64281ed20856cb7fbea1efbf84060b3c3e49cc3acd1ac134 SHA512 d706b23c34d786eb192c178bbd559b2f7538cb840366c1f41ebf32ac3169265418fd11a12e4d9bc5e02be963dc8f1897b11de5ab414b9519827c584d41741de8 WHIRLPOOL 5fc331ee0e88c8b012eabaca8819421e29a4641a16d96bc5d780e6d45bebeb6b3efe6a73c2f5b4cf1a059b5116501a276517691271e5dc583e32dd350951063e
 AUX xendomains.initd-r2 2932 SHA256 65bfda0fb131f944e2f24d7a32eec6b7fc749cb854c3fab3bbb99824524c65ad SHA512 ae66020140c573402d2ac1a915dd217fca6afcc801f3a0a8d1b4d415cdd5a646817eb03ec6f65b9823f253b0dc1eba143e601b9dbedf1e856f9555c2880bf26f WHIRLPOOL fe0885302409fbe4815de71b46b27f307c0add8990d030b883741094f32461a4d8202fbb8be3983232ad3d803cc565374bba78f7b25f83aa61d839b3c77751e9
 AUX xenqemudev.confd 156 SHA256 61c5ff72464c5098d9cad50e5dc94a090dd107b4831bb60a4260cf0a3d12ce81 SHA512 d3cdeaed625e65e60fb22128baf24dceb45143ddf494d7db26464497abc42dbba0c0c9878f1e3908e2910557f4c4d600939824e944938aa251609ec5a1a86ee4 WHIRLPOOL 9633789dcc4dc4eaf7f2198385930bf5474c7a9e531746db89bcae50b8ed78313133a124d4a2b38fb5021337f43cfbd260e4ae391e26d063c68e7aff354be4c2
 AUX xenqemudev.initd 1847 SHA256 c1b002a54917f60adf6941fecf44453c0072a9048c9c3e318d2e695f7ea12c72 SHA512 3fb6a8c5d35b773e0fb7bc9b6c26aa18be48b97d95cbb21df8aefeebb814e3fd5819d579504a4015acb0e5fd6abe2f864f48ea83c095cedae2c69720b6e355ad WHIRLPOOL 2a286111d18eb1f8701f3d30e1fb0b006e2ab359db1ff32100e18fd0e4f46cf13407d765842542c38a31598f62cc71f246bb5c11d06410336850c0288c9e8d4a
@@ -73,12 +72,22 @@ EBUILD xen-tools-4.2.2-r3.ebuild 11697 SHA256 9407f8c81db48b9c41845cbf60635675b5
 EBUILD xen-tools-4.2.2-r5.ebuild 12253 SHA256 026a0da34025fbb9f46f1a13cb3def20df121b81c94ffe601ebd87a0bfadd584 SHA512 7bbfdd91ab7959e180c53a1a8a48d861a904e52c2f379142b2490052926860eeb88d8f88fd97d96b5cb73818c7817f00f7e29a4e36c96c2fa1d0feb84b872eb8 WHIRLPOOL 278aee16c7378d3879ee5bfcbae51191a2f658b5299308f9aaac8463ab0d6d01e92a3b0a8c71d59fb42d05a1748f006fd540a41cb667193a09671349539e9fc5
 EBUILD xen-tools-4.3.0-r3.ebuild 12431 SHA256 9bbbc3fa79bde7b32f3351100e301fc5f45bd9510641c1c65123849dba77d481 SHA512 361a10ba24c458f2d233e48981cc895623e3481001707a64dfdff92c3c27238ad250416e41d7565ed520a44902204a46050fc672f8583e2ee139f1cf34d529b7 WHIRLPOOL 8d9ade3dbd97a3461dc7351d114ae1471fe69b3c347fa8a84887f76567bc1ab4f9b66ca75536305a3d6af459226aa9e7e40be73c5436e78b74478cd73bbd520b
 EBUILD xen-tools-4.3.1-r3.ebuild 12852 SHA256 ab100d4546aa5f6a2fc20e686bbd76a69d488fe96ccd461c866bca71d46aecba SHA512 15885b51113160cbe399728dca14dba25bb9805238ef68e9422f386d959340439fe2fc0de8c6874309c7e2f3dfe9f05228344a173246628b5137d39eaba22955 WHIRLPOOL 38bd3efe7ea382916737bc10ed1523c4fe4b2637669ddd511f1195ec847916e9e534e08f0387fd75cc5d2e786b78e2dab4d4cb715725e1a1c2f11f8fd3a9d8c2
-MISC ChangeLog 50244 SHA256 ff2f53481c914a62363976c1666ace3229e2afe968bece1f2f34cd4ca073373f SHA512 183895a3376a48e4b09179db4d43feef5bdfe7dd47c81afc320d57908e3524a056220b6843249402089e2d4cfe10941f8fc20918b99a20ca04d2509dec190bb9 WHIRLPOOL dd2dd8cffc4530d519c8572639f7be2cc8cbc5d5b2067a322e6eb0858047b32a819a74740d56d244f8d21e501d13cafc457a5162c62b23f422ad6df5973584d7
+MISC ChangeLog 50374 SHA256 e7b076c9cd81ea66b507fdb77c066c22db0b5b0af078440f5442a876c548f421 SHA512 4f07ca2052dbfb9396281aa7a0f2d31a549956fc3da4c9aef9fbb5f9ec1fbd10705f6c0abc7fd00c4e6a1cda465b5e450b49722cc99ce7b3053330d69d276a93 WHIRLPOOL c770d782f8ae642fc26721c30693bd15b96f1c9ca504e8e941550ecd1aa873f8c7f30ab485552d1066688f6bbcde29b1704f2b7b6163b314ef2e6cbd09b8974a
 MISC metadata.xml 912 SHA256 c60760f1637a70d67aa32d4f94d31552769a7b12621c80f897c6ea9591d8620e SHA512 c1ed27bb987d0d9ff8e6d934973772489884f4c1ef6916862cfbaebd3030a360d876b6b9d713cff2b47b99f9144699c8cf7ff693abd22b5a76bd02d1de73e9cf WHIRLPOOL 2fad840e70030a454fec22c5cbfa539d8f31ad4f825f833360a169109e8ee6bd98ab446cf7be5f2ec13dd852223b225f81708d673c582233739f223ab6a37053
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLE8hgACgkQso7CE7gHKw2/awCeJTOlkNfpG2iO5BNsltOUNyRv
-AdEAnjkXaSK0y+UqjbeRGVapREojZK/f
-=IDtq
+iQIcBAEBCAAGBQJS4IxXAAoJEJIMDbyqvv1VBVMP/R/FwmAtrSFtbnMCwMxfmzGo
+0Bys2G8F+wDx/7PUwLiHpj+vHGBqPH0BPdeak12G2DX94jlS9Aqf/w1QqE7Ql6DW
+xqv85mN8hY/DxZHWF3RWMpqGhhrgYsCWiMywcUCbzreDhcFRJfa7PWz2TW7m8eq9
+e1zfTA+eiudXxiQ6sLcgkQ89j4d3/WAcDKO7J+IKtdfUdXAm0QRLenZWmH+yLxnP
+Rj+UdVqjSafPFgNmxoNN4364WBXvLAETpaaqoYXdBpfSJudIPWJs/dM7FHtDiZXZ
+wGsjs18E+KOeCV2Es3rKmFA1hoj8VUSf5RNwtJz0m0YQCfOFZmUY/N/O1FvTxBKJ
+YC9zKgthAU8iNigVre33npjFQqhEVTXsv0RijFhnacp9BoYWGf6K9W79kmqOhpxl
+MQBzDbhvl+xk9j54EBNYMWe+L8IyE11IY+BP2ETA6GzBp0ziZKN5MXSL7GZ4TtKi
+TY1NqMDnWHHZ5j2DG3BFoMqhovBMs4tZ4j7NoZTnPzLDK5lMH65chTk10WHEp2Pw
+8axorl9j3Z8eBsm7g7ejNZwepRkeQFriTc83eCCK3uArp+bKpwC1vvcWVHFFy0dI
+hdExxaUV5U+CzF3Wmi7g67/qUBRudOkTI50N49aKlH+fyFwL2SLkxSqFbAd52ZUS
+EVXgog/dWU4/Ik1Vb+HX
+=kUuS
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen-tools/files/xenconsoled.initd b/app-emulation/xen-tools/files/xenconsoled.initd
index bf6efc56475f..23984841df4f 100644
--- a/app-emulation/xen-tools/files/xenconsoled.initd
+++ b/app-emulation/xen-tools/files/xenconsoled.initd
@@ -1,10 +1,17 @@
 #!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xenconsoled.initd,v 1.4 2013/12/07 06:49:41 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xenconsoled.initd,v 1.5 2014/01/23 03:38:35 dlan Exp $
 
 depend() {
 	need xenstored
+	after lvm
+}
+
+# bug #498720
+shutdown_all_domU() {
+	# Note: shutdown all domU, including manually started ones
+	xl shutdown -a -w >/dev/null
 }
 
 start() {
@@ -18,6 +25,7 @@ start() {
 
 stop() {
 	ebegin "Stopping xenconsoled daemon"
+	shutdown_all_domU
 	start-stop-daemon --stop --exec /usr/sbin/xenconsoled \
 		--pidfile /run/xenconsoled.pid
 	eend $*
diff --git a/app-emulation/xen-tools/files/xendomains.initd-r1 b/app-emulation/xen-tools/files/xendomains.initd-r1
deleted file mode 100755
index a33f5cb9f710..000000000000
--- a/app-emulation/xen-tools/files/xendomains.initd-r1
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/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.5 2013/07/27 06:11:03 idella4 Exp $
-
-extra_commands="status"
-
-depend() {
-	need xend
-	after dhcp
-}
-
-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
-		basename "${1}"
-	else
-		echo ${name_from_file}	
-	fi
-}
-
-is_running() {
-	/usr/sbin/xm list "${1}" >/dev/null 2>&1
-}
-
-using_screen() {
-	[ "${SCREEN}" = "yes" -o "${SCREEN}" = "YES" ]
-}
-
-set_screen_cmd() {
-	screen_cmd="screen -c ${SCREENRC:-/dev/null} -q -r ${SCREEN_NAME:=xen} -X"
-}
-
-start() {
-	set_screen_cmd
-
-	einfo "Starting Xen domains from ${AUTODIR:=/etc/xen/auto}"
-	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 3 \
-		&& ${screen_cmd} zombie dr \
-		&& logrotate -f /etc/xen/xen-consoles.logrotate \
-		&& ${screen_cmd} logfile  /var/log/xen-consoles/%t.log \
-		&& ${screen_cmd} logfile flush ${SCREEN_LOG_INTERVAL:-1} \
-		&& ${screen_cmd} log on \
-		&& ${screen_cmd} deflog on ) >/dev/null
-		if [ $? -ne 0 ] ; then
-			eend 1
-			return 1
-		else
-			eend
-		fi
-	fi
-	# Create all domains with config files in AUTODIR.
-	for dom in $(ls "${AUTODIR:=/etc/xen/auto}/"* 2>/dev/null | sort); do
-		name=$(get_domname ${dom})
-		if ! is_running ${name} ; then
-			ebegin "  Starting domain ${name}"
-			if using_screen ; then
-				${screen_cmd} screen -t ${name} xm create ${dom} -c
-			else
-				xm create --quiet ${dom}
-			fi
-			eend $?
-		else
-			einfo "  Not starting domain ${name} - already running"
-		fi
-	done
-}
-
-stop() {
-	set_screen_cmd
-
-	einfo "Shutting down Xen domains from ${AUTODIR:=/etc/xen/auto}"
-	# Stop all domains with config files in AUTODIR.
-	DOMAINS="$(ls "${AUTODIR:=/etc/xen/auto}/"* 2>/dev/null | sort -r)"
-
-	if [[ "$PARALLEL_SHUTDOWN" == "yes" ]] ; then
-		for dom in $DOMAINS ; do
-			name=$(get_domname ${dom})
-			if is_running ${name} ; then
-				ebegin "  Asking domain ${name} to shutdown in the background..."
-				xm shutdown --wait ${name} >/dev/null &
-			else
-				einfo "  Not stopping domain ${name} - not running"
-			fi
-		done
-		einfo "  Waiting for shutdown of domains that are still running"
-		wait
-		eend $?
-	else
-		for dom in $DOMAINS ; do
-			name=$(get_domname ${dom})
-			if is_running ${name} ; then
-				ebegin "  Waiting for domain ${name} to shutdown"
-				xm shutdown --wait ${name} >/dev/null
-				eend $?
-			else
-				einfo "  Not stopping domain ${name} - not running"
-			fi
-		done
-	fi
-	if using_screen ; then
-		if ${screen_cmd} sleep 0 >/dev/null 2>&1 ; then
-			ebegin "Closing screen session ${SCREEN_NAME}"
-			${screen_cmd} quit
-			eend $?
-		else
-			eend 0
-		fi
-	fi
-}
-
-status() {
-	/usr/sbin/xm list
-}