added avoton arch, fixed run detection

seba76 · Nov 9, 2018 · 380c3e5 · 380c3e5
1 parent 672b666
commit 380c3e5
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/INFO.sh b/INFO.sh
@@ -2,7 +2,7 @@
 [ -f /pkgscripts/include/pkg_util.sh ] && . /pkgscripts/include/pkg_util.sh
 [ -f /pkgscripts-ng/include/pkg_util.sh ] && . /pkgscripts-ng/include/pkg_util.sh
 package="virtualbox4dsm"
-version="5.2.16-123759"
+version="5.2.20-125813"
 displayname="VirtualBox"
 maintainer="seba"
 maintainer_url="http://github.com/seba76/"

diff --git a/SynoBuildConf/depends b/SynoBuildConf/depends
@@ -2,10 +2,10 @@
 
 # each line here is a dependent project
 [BuildDependent]
-linux-3.10.x
 
 [ReferenceOnly]
 # each line here is a project for reference only but no need to be built
+linux-3.10.x
 
 [default]
 all="6.1" 
diff --git a/config.sh b/config.sh
@@ -211,7 +211,7 @@ case $1 in
     update_info
     update_vboxcfg
 	echo "Ready to exec:"
-	echo "         'sudo ./pkgscripts-ng/PkgCreate.py --print-log -I -p ${DSM_PLAT} -v 6.2 linux-3.10.x'"
+	echo "         'sudo ./pkgscripts-ng/PkgCreate.py --print-log -I -S -p ${DSM_PLAT} -v 6.2 linux-3.10.x'"
 	echo "         'sudo ./pkgscripts-ng/PkgCreate.py --print-log -c -I -S -p ${DSM_PLAT} -v 6.2 -x0 -c virtualbox4dsm'"
   ;;
   clean)

diff --git a/package/etc/vbox/vbox.cfg b/package/etc/vbox/vbox.cfg
@@ -1,8 +1,8 @@
 # VirtualBox installation directory
 INSTALL_DIR='/opt/VirtualBox'
 # VirtualBox version
-INSTALL_VER='5.2.16'
-INSTALL_REV='123759'
+INSTALL_VER='5.2.20'
+INSTALL_REV='125813'
 # Build type and user name for logging purposes
 BUILD_TYPE='release'
 VBOXWEB_HOST='127.0.0.1'

diff --git a/spk/scripts/installer b/spk/scripts/installer
@@ -188,15 +188,15 @@ postuninst ()
 preupgrade ()
 {
 	# stop service
-	"${PACKAGE_DIR}/target/scripts/start-stop-status" stop
+	"${PACKAGE_DIR}/scripts/start-stop-status" stop
 
 	# Save some stuff
 	rm -fr ${TMP_DIR}/${PACKAGE}
 	mkdir -p ${TMP_DIR}/${PACKAGE}
 
 	[ -f /etc/vbox/vbox.cfg ] && mv /etc/vbox/vbox.cfg ${TMP_DIR}/${PACKAGE}/
 	[ -f /etc/vbox/vboxwolservice.ini ] && mv /etc/vbox/vboxwolservice.ini ${TMP_DIR}/${PACKAGE}/
-	wizard_bind_ip=${/bin/get_key_value /etc/vbox/vbox.cfg VBOXWEB_HOST}
+	#wizard_bind_ip=$(/bin/get_key_value /etc/vbox/vbox.cfg VBOXWEB_HOST)
 	exit 0
 }
 

diff --git a/spk/scripts/start-stop-status b/spk/scripts/start-stop-status
@@ -20,6 +20,7 @@ SCRIPTLOG="$TARGET_DIR/share/scripts.log"
 PIDFILE="$TARGET_DIR/wolsvc.pid"
 WOL="$PACKAGE_DIR/enabled_wol"
 
+HOME=/root
 
 start()
 {
@@ -69,7 +70,7 @@ stop()
 	"$TARGET_DIR/scripts/vboxdrv.sh" stop >> "${SCRIPTLOG}" 2>&1
 
 	# copy config to share
-	if [ -d $TARGET_DIR/share/ ]; then
+	if [ -d "${HOME}"/.config ]; then
 		cp -rf "${HOME}"/.config $TARGET_DIR/share/
 	fi
 
@@ -101,7 +102,7 @@ case $1 in
 		# 3: package is not running
 		# 4: package status is unknown
 		# 150: package is broken and should be reinstalled. 
-		if [ $(ps aux | grep /opt/VirtualBox -c) == 4 ]; then 
+		if [ $(ps aux | grep -v VBoxHeadless | grep -e /opt/VirtualBox -c) == 4 ]; then 
 			exit 0
 		fi