Update init script to try to use kernel vmw_vmci module if vmci is unavailable

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

4 files changed, 40 insertions, 25 deletions

diff --git a/app-emulation/vmware-workstation/ChangeLog b/app-emulation/vmware-workstation/ChangeLog
index 6b528201641d..4f30debc997f 100644
--- a/app-emulation/vmware-workstation/ChangeLog
+++ b/app-emulation/vmware-workstation/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/vmware-workstation
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.258 2014/04/19 10:13:35 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.259 2014/04/26 20:36:17 dilfridge Exp $
+
+  26 Apr 2014; Andreas K. Huettel <dilfridge@gentoo.org> files/vmware-9.0.rc,
+  files/vmware-10.0.rc:
+  Update init script to try to use kernel vmw_vmci module if vmci is
+  unavailable
 
 *vmware-workstation-10.0.2.1744117 (19 Apr 2014)
 
diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index 726267b93252..29557df45e75 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -4,8 +4,8 @@ Hash: SHA256
 AUX configure-hostd.sh 372 SHA256 072604b18a4122d72004caa33fee4e5a8624f37c6c4a32ac9fb5f834d7cf157b SHA512 87c84f5e51e8b4585a9a55f13771cd8b84f2e4e0bb33679e3a1b23eb84a5be5d523a57b6c770095c1d21712a98e9317bbd215ab027843b0586b35ecf9fb85b49 WHIRLPOOL 6bd9bbfa93bcd85e6b8c135e517fb3b16287696f49080d731d5ea82166c7ac609ca2c508f2c6cd45143f6fd1e2e8cd2310c462b21e34131a9320edfeae623811
 AUX list-bundle-components.xsl 470 SHA256 4fe6b25ecbb99b3a4f15cbb8de41be466ff545f8e9fa1110d62ca0cf24e72395 SHA512 7e1a186e9e40df09f3fdee413e67a5377d04c25f92b807a7800929cb7d585aeb0d5d3869997a409d35ff8dcd0334255d1e33d32e1a78d7ba9876f99b0f8647ae WHIRLPOOL 9b6a0a79e4ecdfe5bdf40eabbeb37d5d69aa34559d5507a6e9350b6978617fb7ccc684fbfd2516f3c591ed76e68acea30872bf74f4d8ad7eff50fafd4f16048c
 AUX list-component-files.xsl 545 SHA256 6682c07630ef4586016776e065018f8695a790c5297408597b1ae24692fab629 SHA512 e3e4e7bf4eac86e614d0363d47e1a0587d3d735a3542dd830304c12b4de822f12f2f9f10cb6c5a128db2112721491f0317a0080a2c8cfd31acdbcda70061b260 WHIRLPOOL b05c186e9d98b51b02d8f068e5b8ae55765a22a2baa046bdd790045a2dade3be9f005f8d342eb914d541dba661d723dcff3e462908c1caea02fd95c802a83a84
-AUX vmware-10.0.rc 896 SHA256 5ecf61dcbdfd0bf235e5cff37d411fa7b07ddd7507d0704323af0e6f8e933445 SHA512 48f3926aca508e3a73c7e80cb3c76c63106834c415045e790ad2c9e04f0d4fea192ebb841d0fa83403c1464e4aa58db597534fdd27c1441c89929f5d50ac43bc WHIRLPOOL 66befaa831645a7808424a52cb8b50a84aeabf621f89e6a96c899404e3c77e6f56610395827cf40674a2a25fc5eb970961034bdbffe350dbccea67ee73fc8921
-AUX vmware-9.0.rc 892 SHA256 28fe67276cbee3cbbc76c70ade6460b11f50c042fe9cd77a186b38d68dd7be9f SHA512 098758c2aa8617741b160831c4745900a33b693f3e4d90832fd22f7cb4244416463a5151444b6a119036bd90ebb2a0f760dd8c5a82ace2f0be422a1d8cd6e9ac WHIRLPOOL 377745ba75ca193b8d15463f9c41a15d1040599c9a7a8471e2c08aeb5040863a59b6b22b9b07af619a4ee923b5328397bc41d5e2726a2f0a7d6d776ac1573011
+AUX vmware-10.0.rc 997 SHA256 287adf0ac9fa41371efbe1b42e00892b420c78ddfccfe64b76dd5ae257e03237 SHA512 abd4c01ae1d1bf991308a3681f7d7227ecec591240240811e8dcb7c5a449133775ca860fa59bf1ca98851e55ba3ea475436f783b02aeabdf26fdd116d4c53a75 WHIRLPOOL 9b5c07fbeb4ae9f503f5cba1d84db9ee5da74dde74395582c8c4ae3360a827c9a87376309b7975e978d50a3ec0a818a044ea770b6449f0b0c23243ffa4707324
+AUX vmware-9.0.rc 996 SHA256 68710268e6ba67b56c439364eed9cce1c8b74258fd94c94dfb540972fa23733b SHA512 e759e767df4247bf77d81607a1eeb3185029193314f34ddcb21e42dbc86c679d89f929b10abaf6880b7ea020e5c12949fc0efa7ad93a5de4dd7212b13ea6d7e8 WHIRLPOOL a62de17b4fed1df4285e64e8431a9cfa03eaff7ecc48103c9c46f765d030055f370dc36b5003265bdbfd67eccb656766b7929f859a3bdf5e748afc32d33bdcc4
 AUX vmware-server-10.0.rc 1690 SHA256 2548a2aed8f33bde76fd6a0fc9a970128332506ebc38d94da87723166cf09efa SHA512 34a604442c9eefefa88a742a1682e4b16ca1cbcf48ef2ff84742dd0bc27314ae3f59ca7db73d588fb20ce4eedb00c97671621ec1bdabd92b1543f33304eb420a WHIRLPOOL 46718c4fafd4e401644de17c043d08bfa59a6575bdf5e6cc26b5828f068729578604301cd2e79ec6bca109d82031684e984e63cd949c2a96bd4ba78b6db2a8fb
 AUX vmware-server-8.0.rc 1686 SHA256 0ee8335d2bf29057990c3ce10ffb9e3eb5180f84eed0a165618c33f4c2ad9cbb SHA512 d83b603539378f6169ac8c84b3f8a9c051093291b73ed24d566b31ffb6ea6cb2989e0a1a7c03c49c3d3afbe13f5a60609ac9e502b6021cebd357824ed85ffc0e WHIRLPOOL e5b36a9070b8a55ec06f811ac7a5e5d433f2a06e636d8b5b719cb75e2b07001486ae7a2500a1c736fc1f2138e5280ae1592e06374b2656d8993faec36d3b113c
 AUX vmware-server-9.0.rc 1686 SHA256 2c92bf5ea701ac2e844431d22cefd82a07b9a54645bb89c8730cbd1277f7c8ce SHA512 64356476de06ccb82c29fafbd286c491e3646ec8e895e5ca8166b2a81d5447b2711ba99659de14e8aa0b4ebbd32381bfe76eae95a9ba3fc7678e9dd31dded408 WHIRLPOOL 9ad0d232e60d558b6ba15068cceb5ad72782e5d25b5442900926df03b0b61fdf3ed06e9fa6c4eb40227e7bd4b317eef6e6fdaed07024d276bf3c566f7dabcc26
@@ -19,22 +19,24 @@ DIST gentoo-01.tar.gz 1884 SHA256 e92c694865f1b29f4d7a39efa1dd87bc71dc5f922573f0
 EBUILD vmware-workstation-10.0.1.1379776-r1.ebuild 14292 SHA256 ae080d59ebfaaf13a6706f6509ce4e22c8971d048bab96ab0b37db9cdae70946 SHA512 92f3bbf9c1736c0a3702c41b94a3d028f0605bd4a4b709ded1aef37748634f43463526b2ac2f70a2b60e7e7ec80e5bc4828eb3721146fd2b9b1f7e37a2ee38c8 WHIRLPOOL 3fa6e987ef0af37647ab0d8e154194c58e410253d84dde38e061f1536a66abf4037f97778bbc8269d09cfffa8a47a51c201674828d413342f4a1dc7501363b62
 EBUILD vmware-workstation-10.0.2.1744117.ebuild 14292 SHA256 f63c45ed05957569e137012ec0a0755d02b8e6f5a221bf3ac79e32359ec39fb9 SHA512 a70938e1f4a7981b30725f53b82539f05ed485543caded93102eaf26c6a3b9ac4f6804e6e223370d948a734fdac463141a4282938f9b66aa1dc29ee92bd7b6b1 WHIRLPOOL b470271eb115c08c35d7ddc9c5fb3b281f523fc9b2800cdfd3f08d4d4800a4bb098fc1d35c1a02a9ee76f08673d9982546a6d409b7cf4408866876e16c923ad0
 EBUILD vmware-workstation-9.0.3.1410761.ebuild 14217 SHA256 d9e8f99de530a0e61be3defbad4ed75f06fa05d273d23990326e6d1686eec42f SHA512 d4c16393bbbdf97a5133fca2610bcd1074eedb322800f5bd4773e71eaf3b7989e483231901f6bf5a2deb03a9dd49fcf97f767e2c8580971b244f01fe4215aa0b WHIRLPOOL cab5419208a7575b0dee7fe8896e64f139f882ca3bd413c656f71ab2311de03d2254796d03950f057bd97d8f1f47fc4e05f2d9557499f427bc9acf021ed0233d
-MISC ChangeLog 44980 SHA256 2bfb2b88dcb3dfd4d506e9c8876994636705d8da92eb9d0659d48d16957cf1a0 SHA512 173f54f30c09b7417bbb5060a50dea9745af91b4c10a3a04f843a750590a1bc04c7ff60482b99f1cac8b495e3682c88f5b0d2a690e310d9c8fc39c578e7d2e47 WHIRLPOOL f761091e3d88589fcfeb5728d0377b5dcdffe516114d87bc6d0ea379d43bc886ad2681a7013372c1df58aa043b5c7f14934b69b9b093311b2a62b5d48384d262
+MISC ChangeLog 45166 SHA256 484d3e571b851feca897b8547c3a413f1b1dc9a0f2fe686fc7f8835e2f283327 SHA512 d7e65db295b1fffae241ebaaacf83e90352a939ec36c0c7b997a9956affdb37d7ad500928ab9af334fb676668658853b628c7f4c7c3a7509f2a094afee59859c WHIRLPOOL 8ba3584b42ab29d31b82a74486751473ffa3ecb890fb97bd0dd9806cc695ce27bc91fefc4e0f0a2285dbfaa655de116df8e93f4c87c724eee5750a85f07b2244
 MISC metadata.xml 757 SHA256 299d53409b7bdc264fadde3385e44b378fb1394745f8df5e3847411f0a3f7217 SHA512 6114d20497a28437680b733e501357b401ae31645f189128c450942adc8c0886530d07ebcc1bed93e3b5966c7e79b13eeb79cb68a6f16da130b3761694f94b4f WHIRLPOOL db2983b2e0a2827824c2a78f5e5379cf0481cbd3bc5612c4a43b196f2d22826362fd3d4fdd1f78d15fdd7e98f7acbc7c1f0a7313955cbf69dc502957e4ecddb4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTUk1NAAoJEJS/30SErRQvh0oQAJZrV5ieMBuRaWL0bKeRdXlV
-FEhG9obkIFmhnj0iwMD73ete02dy9peB1Ne5pqJmYe3NfwmeVlQodlYqKxLZLivg
-fxBi6wY8Ute4HfXoSi4z6PsOLJAR0qroMXENHnNQQExWFeTKMO8p/V6t12yQSu3I
-NTOL20fNmVstI5BK3yEm6cz0fAP9jQYf6VWOWckq2m6gagoMUkh2F9EaD6JlV8+t
-w9UVtZ8w4a7buyzbFPpNlLKI/J/i9Ch1Bvdg3xuB/4EiQm66Lp/kRsbcOefBlKKH
-YXt3mDHXqiKPwZdiM31sizNqgC45zb7mWJci1KgF33LmOs01YsgQ3HXZtLkmg3cI
-s9tB7uRIdRhhB70pmpVLi8ewFIV4eOzOCGr4N2fQItHBLa6T5dKrtFq0/UXQC147
-8KOIz1ePYVyTYwCHrAn8GtINfBJKu/F4A+FrFjMHc7sEz9kZ2FtAO3ZtOS+gMy+w
-Gl/MfQfdK+KN9p4wYQ+F5XI43/Ar5QdFlPq/SsKWvJHqLtUAMUYfzBd208Z5IWKS
-GCVwtnXLiKePTT6w15zQWuNRoRUxyMEX6fCld1IgqATY4OuwizoDw/lq7Yga4isF
-0mA0n37hPLdwFmH20uiFI1xj5wc2CVIm8+TXopKMChp8zvSIfLZ24j/INqkISASx
-3jlpphTsSjvuHeaBDw3H
-=MTiA
+iQJ8BAEBCABmBQJTXBjCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcQk4P/1odXlMVh7yDlBnKSsl0+bRQ
+eJeSwdF29u8L2+aob5HmmW8j7zK7zUJww6lKAScJ//t7FIxmcTEunC4tpBUb44zp
+9xZ73LeAP+hiIuMPOSbP/ZD2ktxpixUJBu4zIi/ALvp8yeLugJiLSynVAIq2RXj2
+LBYStbDZzo4/YHpNibCK2tVUbdm5f8i/lTNesBJLUKPVhVeBQ+LAAHJEegu8y2I6
+TQPiDAPXSm5m2tNC2z43uTUbuvDdvVscgKX4af3NTx0Eb7S6Dk4nQbh0RS2+re3o
+yy6Go5x66/VfNCpIw9uwqWdGGKM2Pg7+e9uKwHgv7+cfIqOTF430Seqkg74BHfkj
+0wpjNcBJqDhK3tZG0SU8/jI1w76KaSutFYG00sF65BiYy708qucAnEfKcu9S3gGm
+5RpTtsvps4mMcF5+GwgB9NXsnHQRzOZkGq6XTOYyh+xna4xW7wnqlyHOcRauK/2e
+bjAd0muEeT0N2hKEzrcF45R5Wqvy3zhTLjRVf62T3jblfItcDYQeLQHcsdVh/lV6
+daD5XkQiDfpc0DZdKDlA0NF5w2jI86v28ybWDL738sqKC90Lvk008UZ5a27bqiTr
+/4fagd982Qx6LpuGFpmZqRmlTJs3n6rdc+9GkJX2ypl38POJVW7VTj3Kc7/JcztI
+er96vAQEFMRHa7R6JtoE
+=V98A
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/vmware-workstation/files/vmware-10.0.rc b/app-emulation/vmware-workstation/files/vmware-10.0.rc
index a7d08c224d4e..82e45f1bd66d 100644
--- a/app-emulation/vmware-workstation/files/vmware-10.0.rc
+++ b/app-emulation/vmware-workstation/files/vmware-10.0.rc
@@ -1,7 +1,7 @@
 #!/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/vmware-workstation/files/vmware-10.0.rc,v 1.1 2013/10/19 11:38:39 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/files/vmware-10.0.rc,v 1.2 2014/04/26 20:36:17 dilfridge Exp $
 
 depend() {
 	need localmount
@@ -14,7 +14,9 @@ start() {
 	@@BINDIR@@/vmware-usbarbitrator 
 	eend $?
 	ebegin Starting VMware services
-	modprobe -a vmmon vmci vsock vmblock vmnet 
+	modprobe -v vmci || modprobe -v vmw_vmci
+	eend $?
+	modprobe -av vmmon vmci vsock vmblock vmnet 
 	eend $?
 	@@BINDIR@@/vmware-networks --start
 	eend $?
@@ -28,6 +30,8 @@ stop() {
 	@@BINDIR@@/vmware-networks --stop 
 	eend $?
 	ebegin Stopping VMware services
-	modprobe -r vsock vmci vmmon vmblock vmnet
+	modprobe -rv vsock vmmon vmblock vmnet
+	eend $?
+	modprobe -rv vmci || modprobe -rv vmw_vmci
 	eend $?
 }
diff --git a/app-emulation/vmware-workstation/files/vmware-9.0.rc b/app-emulation/vmware-workstation/files/vmware-9.0.rc
index 8e5a750b186b..02a82b3fb3a4 100644
--- a/app-emulation/vmware-workstation/files/vmware-9.0.rc
+++ b/app-emulation/vmware-workstation/files/vmware-9.0.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2012 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/vmware-workstation/files/vmware-9.0.rc,v 1.1 2012/12/09 14:30:38 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/files/vmware-9.0.rc,v 1.2 2014/04/26 20:36:17 dilfridge Exp $
 
 depend() {
 	need localmount
@@ -14,7 +14,9 @@ start() {
 	@@BINDIR@@/vmware-usbarbitrator 
 	eend $?
 	ebegin Starting VMware services
-	modprobe -a vmmon vmci vsock vmblock vmnet 
+	modprobe -v vmci || modprobe -v vmw_vmci
+	eend $?
+	modprobe -av vmmon vmci vsock vmblock vmnet 
 	eend $?
 	@@BINDIR@@/vmware-networks --start
 	eend $?
@@ -28,6 +30,8 @@ stop() {
 	@@BINDIR@@/vmware-networks --stop 
 	eend $?
 	ebegin Stopping VMware services
-	modprobe -r vsock vmci vmmon vmblock vmnet
+	modprobe -rv vsock vmmon vmblock vmnet
+	eend $?
+	modprobe -rv vmci || modprobe -rv vmw_vmci
 	eend $?
 }