[app-emulation/xen-tools] Uncomment xl settings, fix bug 370817, adjust init.d script...

Package-Manager: portage-2.2.0_alpha54/cvs/Linux x86_64

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index e80f33af7719d0ca09beeabc20572272eb5e983a..85fd76243febd9c48bf77b7b8d38b583636f4cc9 100644 (file)
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.81 2011/09/05 20:41:30 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.82 2011/09/10 17:22:46 alexxy Exp $
+
+*xen-tools-4.1.1-r2 (10 Sep 2011)
+
+  10 Sep 2011; Alexey Shvetsov <alexxy@gentoo.org> -xen-tools-4.1.1-r1.ebuild,
+  +xen-tools-4.1.1-r2.ebuild, files/xend.initd-r2, files/xendomains.initd-r2:
+  Uncomment xl settings, fix bug 370817, adjust init.d scripts to work for xl;
+  Thanks to Ian Delaney aka idella4
 
   05 Sep 2011; Alexey Shvetsov <alexxy@gentoo.org> xen-tools-4.1.1-r1.ebuild,
   metadata.xml:

diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index d888969ae4a705d4e5f9801bdb2b0bea5a8ae03c..f91c8c13771b8ab35b8513714e5bc2ec425797aa 100644 (file)
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -9,34 +9,34 @@ AUX xen-tools-3.4.2-as-needed.patch 765 RMD160 dbb5ad2ec52e96c40f109e28c91b566e8
 AUX xenconsoled.confd 44 RMD160 0134f85258cf524807c4e2eae94739a70808c20d SHA1 6435bba449e9cffd3f99c5afdeb3cc37ecbd744d SHA256 2a74be03eb74f6013242a4a5d721df6cb9b959b43c405de1e32813f52d749060
 AUX xenconsoled.initd 652 RMD160 5aa785e9c73c5eb8460863af2c1bc50d2a07faf4 SHA1 dceffade1f3f5f2503fc6c3ccb4b9f9788365d00 SHA256 1a5594e4e924b94490c5c942b1b63e5fe857b8ad8061060e5d8a3bdfc9f0f1b7
 AUX xend.initd-r1 1664 RMD160 8d7ea19e96c49631a8f432dd93ae91ca4f37d26b SHA1 bd3a8f083288cd89624d31f3c7932e1a831d99a3 SHA256 6ea8848ca1203c5ef8490014ded86ec67100385c217660d393b25dc6519d254d
-AUX xend.initd-r2 1071 RMD160 41b30381e221364b761ff4e66b77291b97068ec6 SHA1 85b0c5de5de5c08e497c2a33e5d7659a8ff9240d SHA256 00757921b40336d9d338c4dd4e68b8e8301cfa6c0129d958e0106839c8528890
+AUX xend.initd-r2 1064 RMD160 07b94d60a9c93577864086945389ef9821913522 SHA1 60f246da00f829776f1bb9a16ec07a6f91cbd24e SHA256 b9dcd925856eb5213b9052169492492d686b5d1ccae65b1c94a8ac944708d155
 AUX xendomains-screen.confd 594 RMD160 79c7a3546cf1d3f8558c2120d6e8c93c753e66b9 SHA1 7f9ed2986495d5fa4a6f8b050cd632fde6a19994 SHA256 c4d7ffcdbeccc5e93460e2abbf70d642a78a363d79ccbbce0407f50cace54e0a
 AUX xendomains.confd 291 RMD160 75d55db5360da12fc3d721c37001ccbfbb844e52 SHA1 e7be8973a4bcbfc7680258e369b07e2ed097ef49 SHA256 2fac318bb96b357dd185f7729d83c0a0b941799cdb89c24ed83051bb085735dc
 AUX xendomains.initd-r1 2921 RMD160 dd45bbc63a2c497990e193eb80b24b47226a8da2 SHA1 ea3c35c3829371b10ad023f222cf9c360adf0871 SHA256 4c63f354ac076c30ae4cd414224561f50252e9141e3bda95703bd3fb14ea7a59
-AUX xendomains.initd-r2 2941 RMD160 7fb127725fe5a9d6a8a5c373796996c5716d40bd SHA1 4483807c7f3fd1b36af2a88875477043fdaacb45 SHA256 2edecd5efc69baab1ae59e71947c229b0b905fe2173a04a220afe30f407be55b
+AUX xendomains.initd-r2 2933 RMD160 31d35c58d0286a34bebd636e85a9368054b8f6c0 SHA1 5e9cbdb5f2b1770bf30ba99ca7c67dbf38b78e84 SHA256 da69c146e5213df5376bd9b2758d9d5957c802e5513c6ea510e604d00f1d9e40
 AUX xenstored.confd 42 RMD160 3407e1ff0958d5797e257da284798a21fe31a5db SHA1 c18f64d2a41de25695b7dfb924478e3fa64ed0c3 SHA256 afcc14f014fe4ec478f85d230efefba9ffad024bf8c83b30074e8a3712cc7831
 AUX xenstored.initd 812 RMD160 57a880e0024f3733bb3ebe945389eed6474b96f5 SHA1 9837c052afac31ee623ef02280a43114866869c8 SHA256 8f9df8ad835e45f9c995244e9e80d1a9ee630787bf2da88b7c4a73354d056fd8
 DIST xen-3.4.2.tar.gz 11187726 RMD160 2ef81df1f44356d60e04e21df2173ce5357d8509 SHA1 3cd2cafacd52bbac2e2da1cfd846ee6260b43455 SHA256 d17c33136041cc8da69214ccf527fc48637bee7a9ab4d68a88ec50e6a9d20b0b
 DIST xen-4.1.1.tar.gz 10355625 RMD160 4b3c0641b0f098889f627662aa6b8fea00c5b636 SHA1 f1b5ef4b663c339faf9c77fc895327cfbcc9776c SHA256 246289227507466b5da8b2d0da84a5b0e68a392527b16cde38898d0348890f5b
 EBUILD xen-tools-3.4.2.ebuild 7086 RMD160 ce6037714a2bef2aa117157f200ddbcb4bd88484 SHA1 30f5ffe1852ba3c3676a12e1983898d1a89fa852 SHA256 23547d91a41cfe46579310004cb8edcd9119a1b8e5672ba3489f7b845f178b14
-EBUILD xen-tools-4.1.1-r1.ebuild 8538 RMD160 f99f66590c91328142487295ade3db2215c2d712 SHA1 468483fbb9fd2b6c3c7e159930d1f839bd67a88a SHA256 1322a5df464d7c64c260e5d62c71e344d053dc8cd67fd04026f1edd4e86ca642
+EBUILD xen-tools-4.1.1-r2.ebuild 8772 RMD160 9414f0ff4c8032644a62a5c89b54ab2a0eebd5ea SHA1 b0e8bcd57fb8cb70f5d3133f39810ac37af43f3f SHA256 159b4411038debefe53da4a42c27a352719b40602bdee130e346c3f599e785f7
 EBUILD xen-tools-9999.ebuild 8295 RMD160 08b25a6b7b416aa14e4774ddbb9200aac47b56a6 SHA1 bb097135becc1a0728cfff6c358265b1f8e2ffde SHA256 93794a383c65b89617110f41809ce72cfdbdc78a849ecdea384bb8db31669ad9
-MISC ChangeLog 19859 RMD160 2f912324a8d9b92bf0f9ae959bab27aa66e1e19b SHA1 43411744f696076d7b5f3e17d60e1d2c419e1153 SHA256 dd97d0ed88a30a776c5905c38a2323b0e26b52c9421e3125f565f3bfd4f27927
+MISC ChangeLog 20167 RMD160 eecf3f0e65da0cc90b3038086ae6d4ea548fac62 SHA1 312d337d0e038e776745c0c30ca5bf5d3db6f2c1 SHA256 68bc2a0464bc8f8f18846c00ce079b496da95f7987c67be0b086e4ebc8daa25a
 MISC metadata.xml 793 RMD160 f11b22342cd9c0e09ec71c332dc82033d53c4a8e SHA1 f276e51986ee4f8e72dee3f68410ce46a3feef6b SHA256 405864f69371aca210b92bf04a6bead6f6b1f209d96b4f97a5b2b193f001893d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOZTPWAAoJEOf+E+/4L5LmCDEP/2lvoyEdJZOoVppptQGVXMzp
-qyAAVt/T5U3eZyV3JuKEABIKxG1Px3NluiS6REkY55nL3pNB5yYaaZBwt+XkijdE
-m6LtvvXlS9rDYvOrxwWbLs8WkPXrHSpFKCE9dtyuE2kQ2kvDmOlFU2dpEYdEyaDK
-t+WP4oVgsBI0dIOcsUeFv7RBmbHQyIgc5unZ564MA+qM3FML7kA/uqbumbK5c3Lk
-ZolNzppyISnfeekW6yu90Xo62qHDIbmNAoCOh4Diyzpd6CrAzj8noY0+knhk++Pe
-sHD0M1BK3Ur/J+UXMWDzN7g7XZHfGg1CiYBT2nlHw7Ut6OE3Th5sa5OvgB8gajHg
-5oqSl+sHc/2i0IRpvaIl6Jf/B77QtLG9Lf0Ef6FJE50Y09If+9yunG+TTHTrtPgy
-3vaXXEK4vkMbaKES8b3AKasoa7z6ck9/IyhKwssX0pXrEATwHltTfS2FpRgw8Stk
-7uTq69OYc7tYuZHxqNyrPekXBYmO47Uc0wvnn5D/vRmgnUH/8dBwTKd5fjZGvasv
-YljzIO2j6lDn8es12Gzv+bvJi35kQA2UlJN/pjkvzfUrAqj2z+a10QzN5VtxImrK
-SjZwnLOHbDw7v5jRQgSitwEh9hZMxcZNlZRNpL1zAnXYVknYgMbDPLsOuqQqcy3N
-QozPDUnIvay1NXYSirnV
-=fvIT
+iQIcBAEBCAAGBQJOa5y/AAoJEOf+E+/4L5LmyHgP/iaXurmq44aUIS/JNDecthhs
+N+IdQT0FPqgE+WyWtea7qIaWbdFNVFHm5Ebq+4w6eKr4O0qYU47gjzKlDLa4RXGq
+oEB18cw5w1QgSCezQBqfB+ew2afgWWWB4tOoHu/VVyVFH6w591/VwgmsTP9PxhuO
+Og2wg+GNXqttFylbscrrmRZTKaS+xa2skO4Iz15fmJt2oTEhEj7wgVHqCqRAJJGW
+MaQciazuh1ri7NjFdonaNlP84IzfuGHQ2VZx7ahXnPsPlzs9QqArlBf28eNuF/L1
+Zh7qY+FXMvLwKYBRmftE5L8TnhIOlMc1cFdBcHnLNw76NdumqUIjIvd46075A0aj
+aZSqLSLbk0ES2NWje9e5cEb+KtzMbXl3JLI+IvcdPbEHpG1K3UioqmD/t1/+048b
+J5vBd9cDvF1M0OFM11igWYDeI5AKXcQa81Jafdt/XBSd+sFR0T9ACvjqpKR2TMwP
+BAgP1R36avAn05Vwkb0I06aNOYBOmYHlCXCT0LL4bwdSdx/BYSlYjPSSK+HNacqp
+oQt2a+EOYRR29zMrnRMbMljSuGmVqh4g6A8wtVGbouZYdtY2WsvbDi3uFm9E6SD1
+wBLl46H65DYz64uXSEH0vq/kgA0OydQ3hD6fpBWXymbiThwpUw4xsz566+xm+pLu
+fD/Z+c5YMZanhOvD2aQF
+=NSOB
 -----END PGP SIGNATURE-----

diff --git a/app-emulation/xen-tools/files/xend.initd-r2 b/app-emulation/xen-tools/files/xend.initd-r2
index b377182f8f2c01a951e0762ac0759cbf9781d551..b790e7fe4205017b3411dab6758fcfe88fd8525a 100644 (file)
--- a/app-emulation/xen-tools/files/xend.initd-r2
+++ b/app-emulation/xen-tools/files/xend.initd-r2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xend.initd-r2,v 1.1 2011/04/05 21:25:03 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xend.initd-r2,v 1.2 2011/09/10 17:22:46 alexxy Exp $
 
 opts="start stop status restart"
 
@@ -38,7 +38,7 @@ start() {
 stop() {
        if [ "$(xm list | wc -l)" -gt 2 ]; then
                ebegin "  Stopping all domains"
-               /usr/sbin/xl shutdown --all --wait >/dev/null
+               /usr/sbin/xl shutdown -a -w >/dev/null
                eend $?
        fi
 

diff --git a/app-emulation/xen-tools/files/xendomains.initd-r2 b/app-emulation/xen-tools/files/xendomains.initd-r2
index 04eee2297b2474ebd04a2047354eb14403318a26..9240376cc7dc99f400b522df98cb34281561a4fb 100644 (file)
--- 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-2011 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.1 2011/04/05 21:25:03 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xendomains.initd-r2,v 1.2 2011/09/10 17:22:46 alexxy Exp $
 
 opts="start stop status restart"
 
@@ -81,7 +81,7 @@ stop() {
                        name=$(get_domname ${dom})
                        if is_running ${name} ; then
                                ebegin "  Asking domain ${name} to shutdown in the background..."
-                               xl shutdown --wait ${name} >/dev/null &
+                               xl shutdown -w ${name} >/dev/null &
                        else
                                einfo "  Not stopping domain ${name} - not running"
                        fi
@@ -94,7 +94,7 @@ stop() {
                        name=$(get_domname ${dom})
                        if is_running ${name} ; then
                                ebegin "  Waiting for domain ${name} to shutdown"
-                               xl shutdown --wait ${name} >/dev/null
+                               xl shutdown -w ${name} >/dev/null
                                eend $?
                        else
                                einfo "  Not stopping domain ${name} - not running"

diff --git a/app-emulation/xen-tools/xen-tools-4.1.1-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.1.1-r2.ebuild
similarity index 96%
rename from app-emulation/xen-tools/xen-tools-4.1.1-r1.ebuild
rename to app-emulation/xen-tools/xen-tools-4.1.1-r2.ebuild
index 87385ccd1521a83bc05449b7e9108f4d153aa46b..96211a37df241e39ddaa7b1281e0768ada8cb43d 100644 (file)
--- a/app-emulation/xen-tools/xen-tools-4.1.1-r1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.1.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.1.1-r1.ebuild,v 1.2 2011/09/05 20:41:30 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.1-r2.ebuild,v 1.1 2011/09/10 17:22:46 alexxy Exp $
 
 EAPI="3"
 
@@ -187,6 +187,12 @@ src_install() {
        # Remove RedHat-specific stuff
        rm -r "${D}"/etc/init.d/xen* || die
 
+       # uncomment lines in xl.conf
+       sed -e 's:^#autoballoon=1:autoballoon=1:' \
+               -e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \
+               -e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \
+               -i tools/examples/xl.conf  || die
+
        dodoc README docs/README.xen-bugtool docs/ChangeLog
        if use doc; then
                emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs \