[gentoo-commits] gentoo-x86 commit in app-emulation/virtualbox-bin/files: virtualbox-bin-wrapper virtualbox-bin-config virtualbox-bin-interfaces digest-virtualbox-bin-1.4.0-r1 digest-virtualbox-bin-1.5.0-r1

[Markus Ullmann (jokey)]

jokey       07/10/22 22:21:54

  Modified:             virtualbox-bin-wrapper
  Added:                virtualbox-bin-config virtualbox-bin-interfaces
  Removed:              digest-virtualbox-bin-1.4.0-r1
                        digest-virtualbox-bin-1.5.0-r1
  Log:
  Drop old and add new-style wrapper
  (Portage version: 2.1.3.15)

Revision  Changes    Path
1.3                  app-emulation/virtualbox-bin/files/virtualbox-bin-wrapper

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox-bin/files/virtualbox-bin-wrapper?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox-bin/files/virtualbox-bin-wrapper?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox-bin/files/virtualbox-bin-wrapper?r1=1.2&r2=1.3

Index: virtualbox-bin-wrapper
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/files/virtualbox-bin-wrapper,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- virtualbox-bin-wrapper	7 Oct 2007 22:01:12 -0000	1.2
+++ virtualbox-bin-wrapper	22 Oct 2007 22:21:54 -0000	1.3
@@ -1,66 +1,116 @@
 #!/bin/sh
+#
+# innotek VirtualBox
+#
+#  Copyright (C) 2006-2007 innotek GmbH
+# 
+#  This file is part of VirtualBox Open Source Edition (OSE), as
+#  available from http://www.virtualbox.org. This file is free software;
+#  you can redistribute it and/or modify it under the terms of the GNU
+#  General Public License as published by the Free Software Foundation,
+#  in version 2 as it comes in the "COPYING" file of the VirtualBox OSE
+#  distribution. VirtualBox OSE is distributed in the hope that it will
+#  be useful, but WITHOUT ANY WARRANTY of any kind.
+
+PATH="/usr/bin:/bin:/usr/sbin:/sbin"
+CONFIG="/etc/vbox/vbox.cfg"
+
+if [ ! -r "$CONFIG" ]; then
+    echo "Could not find VirtualBox installation. Please reinstall."
+    exit 1
+fi
+	
+. "$CONFIG"
 
-INSTALL_DIR=/opt/VirtualBox
-USER=$( whoami )
-
-SERVER_PID=$( ps -U $USER | grep VBoxSVC | awk '{ print $1 }' )
+# Note: This script must not fail if the module was not successfully installed
+#       because the user might not want to run a VM but only change VM params!
 
-if [ "$1" = shutdown ]; then
-    if [ "$SERVER_PID" != "" ]; then
-        kill -TERM $SERVER_PID
-        sleep 2
-    fi
-    exit 0
-fi
+if [ "$1" = "shutdown" ]; then
+    SHUTDOWN="true"
+elif [ ! -e /lib/modules/`uname -r`/misc/vboxdrv.ko ]; then
+	cat << EOF
+WARNING: There is no module available for the currente kernel (`uname -r`).
+         Please recompile the kernel module and install it by
+	
+	 sudo emerge -1 virtualbox-modules
+
+	 You will not be able to start VMs until this problem is fixed.
+EOF
+elif ! lsmod|grep -q vboxdrv; then
+    cat << EOF
+WARNING: The vboxdrv kernel module is not loaded.
+         Please load the kernel by
+
+           sudo modprobe vboxdrv
+
+         You will not be able to start VMs until this problem is fixed.
+EOF
+elif [ ! -c /dev/vboxdrv ]; then
+    cat << EOF
+WARNING: The character device /dev/vboxdrv does not exist. Try
 
-[ -z "$VBOX_USER_HOME" ] && VBOX_USER_HOME="$HOME/.VirtualBox"
+           sudo /etc/init.d/virtualbox restart
 
-mkdir -p "$VBOX_USER_HOME"
-LOG="$VBOX_USER_HOME/VBoxSVC.log"
+         and if that is not successful, try to re-install the package.
 
-if [ -e /proc/modules -a ! -e /dev/vboxdrv ] ; then
-	echo "Error: vboxdrv kernel module is not loaded..."
-	echo "Please load the module before starting VirtualBox."
-	exit 1
+	 You will not be able to start VMs until this problem is fixed.
+EOF
 elif [ ! -w /dev/vboxdrv ]; then
-	if [ "`id | grep vboxusers`" = "" ]; then
-		echo "Error: You are not a member of the \"vboxusers\" group..."
-		echo "Please add yourself to this group before starting VirtualBox."
-	else
-		echo "Error: /dev/vboxdrv is not writable for some reason..." 
-		echo "If you recently added the current user to the vboxusers group,"
-		echo "then you have to logout and re-login to take the change effect."
-	fi
-	exit 1
+    if [ "`id | grep vboxusers`" = "" ]; then
+        cat << EOF
+WARNING: You are not a member of the "vboxusers" group.  Please add yourself
+         to this group before starting VirtualBox.
+
+	 You will not be able to start VMs until this problem is fixed.
+EOF
+    else
+        cat << EOF
+WARNING: /dev/vboxdrv not writable for some reason. If you recently added the
+         current user to the vboxusers group then you have to logout and
+	 re-login to take the change effect.
+
+	 You will not be able to start VMs until this problem is fixed.
+EOF
+    fi
 fi
 
-export LD_LIBRARY_PATH="$INSTALL_DIR"
+export LD_LIBRARY_PATH="$INSTALL_DIR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
 
+SERVER_PID=`ps -U \`whoami\` | grep VBoxSVC | awk '{ print $1 }'`
 if [ -z "$SERVER_PID" ]; then
-	rm -rf /tmp/.vbox-$USER-ipc
-	[ -f "$LOG.1" ] && mv "$LOG.1" "$LOG.2"
-	[ -f "$LOG.0" ] && mv "$LOG.0" "$LOG.1"
-	[ -f "$LOG" ] && mv "$LOG" "$LOG.0"
-	/opt/VirtualBox/VBoxSVC --daemonize >"$LOG" 2>&1
+    # Server not running yet/anymore, cleanup socket path.
+    # See IPC_GetDefaultSocketPath()!
+    if [ -n "$LOGNAME" ]; then
+        rm -rf /tmp/.vbox-$LOGNAME-ipc > /dev/null 2>&1
+    else
+        rm -rf /tmp/.vbox-$USER-ipc > /dev/null 2>&1
+    fi
+fi
+
+if [ "$SHUTDOWN" = "true" ]; then
+    if [ -n "$SERVER_PID" ]; then
+        kill -TERM $SERVER_PID
+        sleep 2
+    fi
+    exit 0
 fi
 
-APP=$( command -v "$0" )
+APP=`which $0`
 APP=${APP##/*/}
 case "$APP" in
-	virtualbox)
-		exec "$INSTALL_DIR/VirtualBox" "$@"
-		;;
-	vboxmanage)
-		exec "$INSTALL_DIR/VBoxManage" "$@"
-		;;
-	vboxsdl)
-		exec "$INSTALL_DIR/VBoxSDL" "$@"
-		;;
-	vboxvrdp)
-		exec "$INSTALL_DIR/VBoxVRDP" "$@"
-		;;
-	*)
-		echo "Error: Unknown application - $APP"
-		exit 1
-		;;
+  VirtualBox)
+    exec "$INSTALL_DIR/VirtualBox" "$@"
+  ;;
+  VBoxManage)
+    exec "$INSTALL_DIR/VBoxManage" "$@"
+  ;;
+  VBoxSDL)
+    exec "$INSTALL_DIR/VBoxSDL" "$@"
+  ;;
+  VBoxVRDP)
+    exec "$INSTALL_DIR/VBoxVRDP" "$@"
+  ;;
+  *)
+    echo "Unknown application - $APP"
+  ;;
 esac



1.1                  app-emulation/virtualbox-bin/files/virtualbox-bin-config

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox-bin/files/virtualbox-bin-config?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox-bin/files/virtualbox-bin-config?rev=1.1&content-type=text/plain

Index: virtualbox-bin-config
===================================================================
INSTALL_DIR=/opt/VirtualBox



1.1                  app-emulation/virtualbox-bin/files/virtualbox-bin-interfaces

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox-bin/files/virtualbox-bin-interfaces?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox-bin/files/virtualbox-bin-interfaces?rev=1.1&content-type=text/plain

Index: virtualbox-bin-interfaces
===================================================================
# This file is for registering VirtualBox permanent host networking interfaces
# and optionally adding them to network bridges on the host.
# Each line should be of the format <interface name> <user name> [<bridge>].




-- 
gentoo-commits@g.o mailing list