[Pkg-virtualbox-commits] r225 - in trunk/debian: . patches

[bengen at alioth.debian.org]

Author: bengen
Date: 2008-02-20 23:59:04 +0000 (Wed, 20 Feb 2008)
New Revision: 225

Added:
   trunk/debian/virtualbox-ose.default
Modified:
   trunk/debian/changelog
   trunk/debian/patches/10-initscript.dpatch
Log:
Make module loading in initscript configurable (disabled by default).


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-02-20 13:00:25 UTC (rev 224)
+++ trunk/debian/changelog	2008-02-20 23:59:04 UTC (rev 225)
@@ -1,11 +1,15 @@
 virtualbox-ose (1.5.6-dfsg-1) UNRELEASED; urgency=low
 
+  [ Michael Meskes ]
   * New upstream version
   * Fixed LSB headers in init.d scripts, closes: #466311
   * list x11config.pl with correct path in README file, closes: #466621
 
- -- Michael Meskes <meskes at debian.org>  Wed, 20 Feb 2008 13:28:01 +0100
+  [ Hilko Bengen ]
+  * Make module loading in initscript configurable (disabled by default).
 
+ -- Hilko Bengen <bengen at debian.org>  Wed, 20 Feb 2008 23:59:17 +0100
+
 virtualbox-ose (1.5.4-dfsg-5) unstable; urgency=low
 
   [ Daniel Baumann ]

Modified: trunk/debian/patches/10-initscript.dpatch
===================================================================
--- trunk/debian/patches/10-initscript.dpatch	2008-02-20 13:00:25 UTC (rev 224)
+++ trunk/debian/patches/10-initscript.dpatch	2008-02-20 23:59:04 UTC (rev 225)
@@ -5,9 +5,9 @@
 ## DP: Add modprobe to initscript
 
 @DPATCH@
-
---- virtualbox-ose-1.5.4-dfsg/src/VBox/Installer/linux/vboxnet.sh.orig	2007-11-21 20:54:35.000000000 +0100
-+++ virtualbox-ose-1.5.4-dfsg/src/VBox/Installer/linux/vboxnet.sh	2008-02-15 10:20:31.000000000 +0100
+diff -urNad virtualbox-ose~/src/VBox/Installer/linux/vboxnet.sh virtualbox-ose/src/VBox/Installer/linux/vboxnet.sh
+--- virtualbox-ose~/src/VBox/Installer/linux/vboxnet.sh	2008-02-20 14:47:20.000000000 +0100
++++ virtualbox-ose/src/VBox/Installer/linux/vboxnet.sh	2008-02-21 00:57:47.000000000 +0100
 @@ -19,10 +19,10 @@
  #
  ### BEGIN INIT INFO
@@ -22,18 +22,34 @@
 +# Default-Stop:   0 1 6
  # Description:    VirtualBox permanent host networking setup
  ### END INIT INFO
-
-@@ -383,10 +383,13 @@
  
+@@ -32,6 +32,11 @@
+ VARFILE="/var/run/VirtualBox/vboxnet"
+ TAPDEV="/dev/net/tun"
+ 
++# Include virtualbox-ose defaults if available
++if [ -f /etc/default/virtualbox-ose ] ; then
++    . /etc/default/virtualbox-ose
++fi
++
+ if [ -f /etc/redhat-release ]; then
+     system=redhat
+ elif [ -f /etc/SuSE-release ]; then
+@@ -382,10 +387,17 @@
+ 
  case "$1" in
  start)
 +    # try to insert module but do not fail if not possible
-+    /sbin/modprobe -q vboxdrv || true
++    if [ "$LOAD_VBOXDRV_MODULE" = 1 ]; then
++        /sbin/modprobe -q vboxdrv || true
++    fi
      start
      ;;
  stop)
      stop
-+    /sbin/modprobe -qr vboxdrv
++    if [ "$LOAD_VBOXDRV_MODULE" = 1 ]; then
++        /sbin/modprobe -qr vboxdrv
++    fi
      ;;
  restart)
      restart

Added: trunk/debian/virtualbox-ose.default
===================================================================
--- trunk/debian/virtualbox-ose.default	                        (rev 0)
+++ trunk/debian/virtualbox-ose.default	2008-02-20 23:59:04 UTC (rev 225)
@@ -0,0 +1,11 @@
+# Defaults for virtualbox-ose initscript
+# sourced by /etc/init.d/virtualbox-ose
+# installed at /etc/default/virtualbox-ose by the maintainer scripts
+
+#
+# This is a POSIX shell fragment
+#
+
+# Set this to 1 if you would like the vboxdrv module to be loaded by
+# the init script.
+LOAD_VBOXDRV_MODULE=0