--- trunk/virtualbox/virtualbox-wrapper.sh	2012/03/03 02:48:55	1672
+++ trunk/virtualbox/virtualbox-wrapper.sh	2012/03/03 03:48:52	1673
@@ -1,9 +1,9 @@
 #!/bin/bash
-# $Header: /root/magellan-cvs/src/virtualbox/virtualbox-wrapper.sh,v 1.7 2009-07-01 18:00:38 niro Exp $
+# $Id$
 # Wrapper for virtual for Magellan-Linux
 
-LIBDIR=/usr/lib
-INSTDIR=${LIBDIR}/virtualbox
+source /etc/vbox/vbox.cfg
+
 XPCOM_DAEMON=VBoxSVC
 VBOXCONFIG=$HOME/.VirtualBox
 VBOXLOG=${VBOXCONFIG}/log
@@ -36,7 +36,7 @@
 fi
 
 # set lib dir
-export LD_LIBRARY_PATH="${INSTDIR}"
+export LD_LIBRARY_PATH="${INSTALL_DIR}"
 
 # check for the vbox XPCOM daemon
 pid=$( ps -U $USER | grep ${XPCOM_DAEMON} | awk '{ print $1 }' )
@@ -53,24 +53,24 @@
 
 # start the daemon
 install -d ${VBOXCONFIG}
-${INSTDIR}/${XPCOM_DAEMON} --daemonize > ${VBOXLOG} 2>&1
+${INSTALL_DIR}/${XPCOM_DAEMON} --daemonize > ${VBOXLOG} 2>&1
 
 # start the proper application
 case $(basename $0) in
 	virtualbox)
-		exec ${INSTDIR}/VirtualBox $*
+		exec ${INSTALL_DIR}/VirtualBox $*
 		;;
 	vboxmanage)
-		exec ${INSTDIR}/VBoxManage $*
+		exec ${INSTALL_DIR}/VBoxManage $*
 		;;
 	vboxsdl)
-		exec ${INSTDIR}/VBoxSDL $*
+		exec ${INSTALL_DIR}/VBoxSDL $*
 		;;
 	vboxbfe)
-		exec ${INSTDIR}/VBoxBFE $*
+		exec ${INSTALL_DIR}/VBoxBFE $*
 		;;
 	vboxheadless|vboxvrdp)
-		exec ${INSTDIR}/VBoxHeadless $*
+		exec ${INSTALL_DIR}/VBoxHeadless $*
 		;;
 	*)
 		echo -e ${COLRED}"Error: Unknown application - $(basename $0)"${COLDEFAULT}