Gentoo Archives: gentoo-commits

From: "Andreas HAttel (dilfridge)" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/vmware-workstation/files: vmware-10.0.rc vmware-9.0.rc
Date: Sat, 26 Apr 2014 20:36:22
Message-Id: 20140426203617.DA6A22004B@flycatcher.gentoo.org
1 dilfridge 14/04/26 20:36:17
2
3 Modified: vmware-10.0.rc vmware-9.0.rc
4 Log:
5 Update init script to try to use kernel vmw_vmci module if vmci is unavailable
6
7 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)
8
9 Revision Changes Path
10 1.2 app-emulation/vmware-workstation/files/vmware-10.0.rc
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-workstation/files/vmware-10.0.rc?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-workstation/files/vmware-10.0.rc?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-workstation/files/vmware-10.0.rc?r1=1.1&r2=1.2
15
16 Index: vmware-10.0.rc
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/files/vmware-10.0.rc,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- vmware-10.0.rc 19 Oct 2013 11:38:39 -0000 1.1
23 +++ vmware-10.0.rc 26 Apr 2014 20:36:17 -0000 1.2
24 @@ -1,7 +1,7 @@
25 #!/sbin/runscript
26 -# Copyright 1999-2013 Gentoo Foundation
27 +# Copyright 1999-2014 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $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 $
30 +# $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 $
31
32 depend() {
33 need localmount
34 @@ -14,7 +14,9 @@
35 @@BINDIR@@/vmware-usbarbitrator
36 eend $?
37 ebegin Starting VMware services
38 - modprobe -a vmmon vmci vsock vmblock vmnet
39 + modprobe -v vmci || modprobe -v vmw_vmci
40 + eend $?
41 + modprobe -av vmmon vmci vsock vmblock vmnet
42 eend $?
43 @@BINDIR@@/vmware-networks --start
44 eend $?
45 @@ -28,6 +30,8 @@
46 @@BINDIR@@/vmware-networks --stop
47 eend $?
48 ebegin Stopping VMware services
49 - modprobe -r vsock vmci vmmon vmblock vmnet
50 + modprobe -rv vsock vmmon vmblock vmnet
51 + eend $?
52 + modprobe -rv vmci || modprobe -rv vmw_vmci
53 eend $?
54 }
55
56
57
58 1.2 app-emulation/vmware-workstation/files/vmware-9.0.rc
59
60 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-workstation/files/vmware-9.0.rc?rev=1.2&view=markup
61 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-workstation/files/vmware-9.0.rc?rev=1.2&content-type=text/plain
62 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-workstation/files/vmware-9.0.rc?r1=1.1&r2=1.2
63
64 Index: vmware-9.0.rc
65 ===================================================================
66 RCS file: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/files/vmware-9.0.rc,v
67 retrieving revision 1.1
68 retrieving revision 1.2
69 diff -u -r1.1 -r1.2
70 --- vmware-9.0.rc 9 Dec 2012 14:30:38 -0000 1.1
71 +++ vmware-9.0.rc 26 Apr 2014 20:36:17 -0000 1.2
72 @@ -1,7 +1,7 @@
73 #!/sbin/runscript
74 -# Copyright 1999-2012 Gentoo Foundation
75 +# Copyright 1999-2014 Gentoo Foundation
76 # Distributed under the terms of the GNU General Public License v2
77 -# $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 $
78 +# $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 $
79
80 depend() {
81 need localmount
82 @@ -14,7 +14,9 @@
83 @@BINDIR@@/vmware-usbarbitrator
84 eend $?
85 ebegin Starting VMware services
86 - modprobe -a vmmon vmci vsock vmblock vmnet
87 + modprobe -v vmci || modprobe -v vmw_vmci
88 + eend $?
89 + modprobe -av vmmon vmci vsock vmblock vmnet
90 eend $?
91 @@BINDIR@@/vmware-networks --start
92 eend $?
93 @@ -28,6 +30,8 @@
94 @@BINDIR@@/vmware-networks --stop
95 eend $?
96 ebegin Stopping VMware services
97 - modprobe -r vsock vmci vmmon vmblock vmnet
98 + modprobe -rv vsock vmmon vmblock vmnet
99 + eend $?
100 + modprobe -rv vmci || modprobe -rv vmw_vmci
101 eend $?
102 }