- Fix logic error in scripts to build kernel modules locally - see bnc#1042726.

Temporarily remove "requires" for net-tools-deprecated so that Leap 42.3 will build.

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=341

vboxguestconfig.sh

@@ -8,12 +8,18 @@
 SOURCE="/usr/src/kernel-modules"
 LOGFILE="/var/log/virtualbox.log"
 INCLUDE="/lib/modules/`uname -r`/build/include"
-
+#
+# Test if vboxsf module loaded. If it is, skip everything else
+loaded=$(lsmod | grep vboxsf)
+if [ -n "$loaded" ] ; then
+	echo "Kernel modules available - exiting..."
+	exit 0
+fi
 # Force installation of VB guest sources. Zypper will install all the prerequisies
 echo "Installing all required packages..."
 killproc PackageKit
 zypper install -y virtualbox-guest-source > /dev/null 2>&1
-if [ ! $? ] ; then
+if [ "$?" -ne 0 ] ; then
 	echo "Installation of required packages failed."
 	echo "Use 'sudo zypper install virtualbox-guest-source' to see the reason."
 	exit 1
@@ -21,10 +27,10 @@ fi
 # Prerequisites are available, start build
 pushd $SOURCE > /dev/null 2>&1
 echo "Building kernel modules..."
-tar jxf additions/guest_src.tar.bz2 > /dev/null 2>&1
+tar jxf addition/guest_src.tar.bz2 > /dev/null 2>&1
 cd additions/src
 make > $LOGFILE 2>&1
-if [ ! $? ] ; then
+if [ "$?" -ne 0 ] ; then
 	echo ""
 	echo "Build of VirtualBox guest kernel modules failed."
 	echo "Look at $LOGFILE to find reasons."
@@ -34,7 +40,7 @@ else
 echo "Kernel modules built correctly. They will now be installed."
 fi
 make install >> $LOGFILE 2>&1
-if [ ! $? ] ; then
+if [ "$?" -ne 0 ] ; then
 	echo ""
 	echo "Installation of VirtualBox guest kernel modules failed."
 	echo "Look at $LOGFILE to find reasons."
@@ -44,7 +50,7 @@ fi
 depmod -a
 modprobe -av vboxguest vboxvideo vboxsf
 cd ../..
-rm -rf additions/src
+rm -rf additions
 popd > /dev/null 2>&1
 echo "Kernel modules are installed and loaded."
 exit 0