[Pkg-virtualbox-commits] [SCM] virtualbox Debian packaging branch, master, updated. debian/4.2.16-dfsg-1

[Felix Geyer]

The following commit has been merged in the master branch:
commit 41a3f71c343b42f0c972f359e9d0e8a33a807f73
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sun Jul 21 21:44:43 2013 +0200

    Explicity load the vboxguest and vboxsf kernel modules in the virtualbox-guest-utils init script.
    
    This makes sure that shared folders can be mounted.
    
    Closes: #712438

diff --git a/debian/changelog b/debian/changelog
index 0322d73..9967869 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ virtualbox (4.2.16-dfsg-1) UNRELEASED; urgency=low
     - Fixes CVE-2013-3792: virtio-net host DoS (Closes: #715327)
   * Drop 36-python-multiarch.patch and 37-wheezy-kernel-drm.patch,
     fixed upstream.
+  * Explicity load the vboxguest and vboxsf kernel modules in the
+    virtualbox-guest-utils init script.
+    This makes sure that shared folders can be mounted. (Closes: #712438)
 
   [ Gianfranco Costamagna ]
   * Patch refresh.
diff --git a/debian/virtualbox-guest-utils.init b/debian/virtualbox-guest-utils.init
index 3cb777f..2f7a518 100644
--- a/debian/virtualbox-guest-utils.init
+++ b/debian/virtualbox-guest-utils.init
@@ -26,11 +26,40 @@ in_virtual_machine()
 	return 0
 }
 
+running()
+{
+    lsmod | grep -q "$1[^_-]"
+}
+
 case "$1" in
   start)
 	in_virtual_machine || exit 0
 	log_begin_msg "Starting VirtualBox Additions"
 
+	if ! running vboxguest; then
+		if ! modprobe vboxguest > /dev/null 2>&1; then
+			if ! find /lib/modules/`uname -r` -name "vboxguest\.*" 2>/dev/null|grep -q vboxguest; then
+				log_failure_msg "No suitable module for running kernel found"
+			else
+				log_failure_msg "modprobe vboxguest failed. Please use 'dmesg' to find out why"
+			fi
+			log_end_msg 1
+			return 1
+		fi
+	fi
+
+	if ! running vboxsf; then
+		if ! modprobe vboxsf > /dev/null 2>&1; then
+			if ! find /lib/modules/`uname -r` -name "vboxsf\.*" 2>/dev/null|grep -q vboxsf; then
+				log_failure_msg "No suitable module for running kernel found"
+			else
+				log_failure_msg "modprobe vboxsf failed. Please use 'dmesg' to find out why"
+			fi
+			log_end_msg 1
+			return 1
+		fi
+	fi
+
 	start-stop-daemon --start --quiet --oknodo --exec /usr/sbin/VBoxService
 	if [ $? -ne 0 ]; then
 		log_end_msg 1

-- 
virtualbox Debian packaging