1 |
jokey 08/10/27 17:15:21 |
2 |
|
3 |
Modified: virtualbox-bin.desktop |
4 |
Added: virtualbox-bin-2-wrapper virtualbox-bin-1-wrapper |
5 |
Removed: virtualbox-bin-wrapper virtualbox-bin-2.0.2-wrapper |
6 |
Log: |
7 |
(Proxy commit) Version bump |
8 |
(Portage version: 2.2_rc12/cvs/Linux 2.6.26-gentoo-r1 i686) |
9 |
|
10 |
Revision Changes Path |
11 |
1.3 app-emulation/virtualbox-bin/files/virtualbox-bin.desktop |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox-bin/files/virtualbox-bin.desktop?rev=1.3&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox-bin/files/virtualbox-bin.desktop?rev=1.3&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox-bin/files/virtualbox-bin.desktop?r1=1.2&r2=1.3 |
16 |
|
17 |
Index: virtualbox-bin.desktop |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/files/virtualbox-bin.desktop,v |
20 |
retrieving revision 1.2 |
21 |
retrieving revision 1.3 |
22 |
diff -u -r1.2 -r1.3 |
23 |
--- virtualbox-bin.desktop 13 Jun 2008 22:44:28 -0000 1.2 |
24 |
+++ virtualbox-bin.desktop 27 Oct 2008 17:15:21 -0000 1.3 |
25 |
@@ -4,5 +4,5 @@ |
26 |
Comment=Run several virtual systems on a single host computer |
27 |
Exec=VirtualBox |
28 |
TryExec=VirtualBox |
29 |
-Icon=virtualbox |
30 |
+Icon=virtualbox-bin |
31 |
Categories=System;Emulator; |
32 |
|
33 |
|
34 |
|
35 |
1.1 app-emulation/virtualbox-bin/files/virtualbox-bin-2-wrapper |
36 |
|
37 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox-bin/files/virtualbox-bin-2-wrapper?rev=1.1&view=markup |
38 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox-bin/files/virtualbox-bin-2-wrapper?rev=1.1&content-type=text/plain |
39 |
|
40 |
Index: virtualbox-bin-2-wrapper |
41 |
=================================================================== |
42 |
#!/bin/sh |
43 |
# |
44 |
# Sun xVM VirtualBox |
45 |
# |
46 |
# Copyright (C) 2006-2007 Sun Microsystems, Inc. |
47 |
# |
48 |
# This file is part of VirtualBox Open Source Edition (OSE), as |
49 |
# available from http://www.virtualbox.org. This file is free software; |
50 |
# you can redistribute it and/or modify it under the terms of the GNU |
51 |
# General Public License (GPL) as published by the Free Software |
52 |
# Foundation, in version 2 as it comes in the "COPYING" file of the |
53 |
# VirtualBox OSE distribution. VirtualBox OSE is distributed in the |
54 |
# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. |
55 |
# |
56 |
# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa |
57 |
# Clara, CA 95054 USA or visit http://www.sun.com if you need |
58 |
# additional information or have any questions. |
59 |
# |
60 |
|
61 |
PATH="/usr/bin:/bin:/usr/sbin:/sbin" |
62 |
CONFIG="/etc/vbox/vbox.cfg" |
63 |
|
64 |
if [ ! -r "$CONFIG" ]; then |
65 |
echo "Could not find VirtualBox installation. Please reinstall." |
66 |
exit 1 |
67 |
fi |
68 |
|
69 |
. "$CONFIG" |
70 |
|
71 |
# Note: This script must not fail if the module was not successfully installed |
72 |
# because the user might not want to run a VM but only change VM params! |
73 |
|
74 |
if [ "$1" = "shutdown" ]; then |
75 |
SHUTDOWN="true" |
76 |
elif ! lsmod|grep -q vboxdrv; then |
77 |
cat << EOF |
78 |
WARNING: The vboxdrv kernel module is not loaded. |
79 |
Please load the kernel module by: |
80 |
|
81 |
sudo modprobe vboxdrv |
82 |
|
83 |
You will not be able to start VMs until this problem is fixed. |
84 |
EOF |
85 |
EOF |
86 |
elif [ ! -c /dev/vboxdrv ]; then |
87 |
cat << EOF |
88 |
WARNING: The character device /dev/vboxdrv does not exist. |
89 |
Please try to reload the kernel module by: |
90 |
|
91 |
sudo rmmod vboxdrv; sleep 2; sudo modprobe vboxdrv |
92 |
|
93 |
and if that is not successful, try to re-install the package by: |
94 |
|
95 |
sudo emerge -1 app-emulation/virtualbox-modules |
96 |
|
97 |
You will not be able to start VMs until this problem is fixed. |
98 |
EOF |
99 |
fi |
100 |
|
101 |
SERVER_PID=`ps -U \`whoami\` | grep VBoxSVC | awk '{ print $1 }'` |
102 |
if [ -z "$SERVER_PID" ]; then |
103 |
# Server not running yet/anymore, cleanup socket path. |
104 |
# See IPC_GetDefaultSocketPath()! |
105 |
if [ -n "$LOGNAME" ]; then |
106 |
rm -rf /tmp/.vbox-$LOGNAME-ipc > /dev/null 2>&1 |
107 |
else |
108 |
rm -rf /tmp/.vbox-$USER-ipc > /dev/null 2>&1 |
109 |
fi |
110 |
fi |
111 |
|
112 |
if [ "$SHUTDOWN" = "true" ]; then |
113 |
if [ -n "$SERVER_PID" ]; then |
114 |
kill -TERM $SERVER_PID |
115 |
sleep 2 |
116 |
fi |
117 |
exit 0 |
118 |
fi |
119 |
|
120 |
APP=`which $0` |
121 |
APP=`basename $APP` |
122 |
APP=${APP##/*/} |
123 |
case "$APP" in |
124 |
VirtualBox) |
125 |
exec "$INSTALL_DIR/VirtualBox" "$@" |
126 |
;; |
127 |
VBoxManage) |
128 |
exec "$INSTALL_DIR/VBoxManage" "$@" |
129 |
;; |
130 |
VBoxSDL) |
131 |
exec "$INSTALL_DIR/VBoxSDL" "$@" |
132 |
;; |
133 |
VBoxVRDP) |
134 |
exec "$INSTALL_DIR/VBoxHeadless" "$@" |
135 |
;; |
136 |
VBoxHeadless) |
137 |
exec "$INSTALL_DIR/VBoxHeadless" "$@" |
138 |
;; |
139 |
vboxwebsrv) |
140 |
exec "$INSTALL_DIR/vboxwebsrv" "$@" |
141 |
;; |
142 |
*) |
143 |
echo "Unknown application - $APP" |
144 |
;; |
145 |
esac |
146 |
|
147 |
|
148 |
|
149 |
1.1 app-emulation/virtualbox-bin/files/virtualbox-bin-1-wrapper |
150 |
|
151 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox-bin/files/virtualbox-bin-1-wrapper?rev=1.1&view=markup |
152 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox-bin/files/virtualbox-bin-1-wrapper?rev=1.1&content-type=text/plain |
153 |
|
154 |
Index: virtualbox-bin-1-wrapper |
155 |
=================================================================== |
156 |
#!/bin/sh |
157 |
# |
158 |
# Sun xVM VirtualBox |
159 |
# |
160 |
# Copyright (C) 2006-2007 Sun Microsystems, Inc. |
161 |
# |
162 |
# This file is part of VirtualBox Open Source Edition (OSE), as |
163 |
# available from http://www.virtualbox.org. This file is free software; |
164 |
# you can redistribute it and/or modify it under the terms of the GNU |
165 |
# General Public License (GPL) as published by the Free Software |
166 |
# Foundation, in version 2 as it comes in the "COPYING" file of the |
167 |
# VirtualBox OSE distribution. VirtualBox OSE is distributed in the |
168 |
# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. |
169 |
# |
170 |
# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa |
171 |
# Clara, CA 95054 USA or visit http://www.sun.com if you need |
172 |
# additional information or have any questions. |
173 |
# |
174 |
|
175 |
PATH="/usr/bin:/bin:/usr/sbin:/sbin" |
176 |
CONFIG="/etc/vbox/vbox.cfg" |
177 |
|
178 |
if [ ! -r "$CONFIG" ]; then |
179 |
echo "Could not find VirtualBox installation. Please reinstall." |
180 |
exit 1 |
181 |
fi |
182 |
|
183 |
. "$CONFIG" |
184 |
|
185 |
# Note: This script must not fail if the module was not successfully installed |
186 |
# because the user might not want to run a VM but only change VM params! |
187 |
|
188 |
if [ "$1" = "shutdown" ]; then |
189 |
SHUTDOWN="true" |
190 |
elif [ ! -e /lib/modules/`uname -r`/misc/vboxdrv.ko ]; then |
191 |
cat << EOF |
192 |
WARNING: There is no module available for the current kernel (`uname -r`). |
193 |
Please recompile the kernel module and install it by: |
194 |
|
195 |
sudo emerge -1 app-emulation/virtualbox-modules |
196 |
|
197 |
You will not be able to start VMs until this problem is fixed. |
198 |
EOF |
199 |
elif ! lsmod|grep -q vboxdrv; then |
200 |
cat << EOF |
201 |
WARNING: The vboxdrv kernel module is not loaded. |
202 |
Please load the kernel module by: |
203 |
|
204 |
sudo modprobe vboxdrv |
205 |
|
206 |
You will not be able to start VMs until this problem is fixed. |
207 |
EOF |
208 |
elif [ ! -c /dev/vboxdrv ]; then |
209 |
cat << EOF |
210 |
WARNING: The character device /dev/vboxdrv does not exist. |
211 |
Please try to reload the kernel module by: |
212 |
|
213 |
sudo rmmod vboxdrv; sleep 2; sudo modprobe vboxdrv |
214 |
|
215 |
and if that is not successful, try to re-install the package by: |
216 |
|
217 |
sudo emerge -1 app-emulation/virtualbox-modules |
218 |
|
219 |
You will not be able to start VMs until this problem is fixed. |
220 |
EOF |
221 |
elif [ ! -w /dev/vboxdrv ]; then |
222 |
if [ "`id | grep vboxusers`" = "" ]; then |
223 |
cat << EOF |
224 |
WARNING: You are not a member of the "vboxusers" group. |
225 |
Please add yourself to this group before starting VirtualBox. |
226 |
|
227 |
You will not be able to start VMs until this problem is fixed. |
228 |
EOF |
229 |
else |
230 |
cat << EOF |
231 |
WARNING: /dev/vboxdrv not writable for some reason. |
232 |
If you recently added the current user to the "vboxusers" group |
233 |
then you have to logout and re-login to take the change effect. |
234 |
|
235 |
You will not be able to start VMs until this problem is fixed. |
236 |
EOF |
237 |
fi |
238 |
fi |
239 |
|
240 |
export LD_LIBRARY_PATH="$INSTALL_DIR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" |
241 |
|
242 |
SERVER_PID=`ps -U \`whoami\` | grep VBoxSVC | awk '{ print $1 }'` |
243 |
if [ -z "$SERVER_PID" ]; then |
244 |
# Server not running yet/anymore, cleanup socket path. |
245 |
# See IPC_GetDefaultSocketPath()! |
246 |
if [ -n "$LOGNAME" ]; then |
247 |
rm -rf /tmp/.vbox-$LOGNAME-ipc > /dev/null 2>&1 |
248 |
else |
249 |
rm -rf /tmp/.vbox-$USER-ipc > /dev/null 2>&1 |
250 |
fi |
251 |
fi |
252 |
|
253 |
if [ "$SHUTDOWN" = "true" ]; then |
254 |
if [ -n "$SERVER_PID" ]; then |
255 |
kill -TERM $SERVER_PID |
256 |
sleep 2 |
257 |
fi |
258 |
exit 0 |
259 |
fi |
260 |
|
261 |
APP=`which $0` |
262 |
APP=`basename $APP` |
263 |
APP=${APP##/*/} |
264 |
case "$APP" in |
265 |
VirtualBox) |
266 |
exec "$INSTALL_DIR/VirtualBox" "$@" |
267 |
;; |
268 |
VBoxManage) |
269 |
exec "$INSTALL_DIR/VBoxManage" "$@" |
270 |
;; |
271 |
VBoxSDL) |
272 |
exec "$INSTALL_DIR/VBoxSDL" "$@" |
273 |
;; |
274 |
VBoxVRDP) |
275 |
exec "$INSTALL_DIR/VBoxHeadless" "$@" |
276 |
;; |
277 |
VBoxHeadless) |
278 |
exec "$INSTALL_DIR/VBoxHeadless" "$@" |
279 |
;; |
280 |
vboxwebsrv) |
281 |
exec "$INSTALL_DIR/vboxwebsrv" "$@" |
282 |
;; |
283 |
*) |
284 |
echo "Unknown application - $APP" |
285 |
;; |
286 |
esac |