[Pkg-virtualbox-commits] r405 - in virtualbox-ose/trunk/debian: . patches
meskes at alioth.debian.org
meskes at alioth.debian.org
Thu Dec 18 15:39:00 UTC 2008
Author: meskes
Date: 2008-12-18 15:39:00 +0000 (Thu, 18 Dec 2008)
New Revision: 405
Removed:
virtualbox-ose/trunk/debian/patches/07-init-fail.dpatch
Modified:
virtualbox-ose/trunk/debian/patches/00list
virtualbox-ose/trunk/debian/patches/08-init-lsb.dpatch
virtualbox-ose/trunk/debian/patches/09-initscript.dpatch
virtualbox-ose/trunk/debian/virtualbox-ose.default
Log:
Adjusted/Rediffed patches.
Modified: virtualbox-ose/trunk/debian/patches/00list
===================================================================
--- virtualbox-ose/trunk/debian/patches/00list 2008-12-18 11:50:09 UTC (rev 404)
+++ virtualbox-ose/trunk/debian/patches/00list 2008-12-18 15:39:00 UTC (rev 405)
@@ -3,7 +3,6 @@
03-localconf-kmk.dpatch
04-vboxdrv-references.dpatch
06-xsession.dpatch
-07-init-fail.dpatch
08-init-lsb.dpatch
09-initscript.dpatch
10-workaround-gcc-ice.dpatch
Deleted: virtualbox-ose/trunk/debian/patches/07-init-fail.dpatch
===================================================================
--- virtualbox-ose/trunk/debian/patches/07-init-fail.dpatch 2008-12-18 11:50:09 UTC (rev 404)
+++ virtualbox-ose/trunk/debian/patches/07-init-fail.dpatch 2008-12-18 15:39:00 UTC (rev 405)
@@ -1,18 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 07-init-fail.dpatch by Michael Meskes <meskes at debian.org>
-##
-## DP: Fix some failures in init script.
-
- at DPATCH@
-
-diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Installer/linux/vboxnet.sh.in virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in
---- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Installer/linux/vboxnet.sh.in 2008-04-30 14:05:52.000000000 +0000
-+++ virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in 2008-05-09 09:28:11.000000000 +0000
-@@ -49,6 +49,7 @@ fi
- if [ -z "$NOLSB" ]; then
- . /lib/lsb/init-functions
- fail_msg() {
-+ [ -f "$VARFILE" ] && rm $VARFILE
- echo ""
- log_failure_msg "$1"
- }
Modified: virtualbox-ose/trunk/debian/patches/08-init-lsb.dpatch
===================================================================
--- virtualbox-ose/trunk/debian/patches/08-init-lsb.dpatch 2008-12-18 11:50:09 UTC (rev 404)
+++ virtualbox-ose/trunk/debian/patches/08-init-lsb.dpatch 2008-12-18 15:39:00 UTC (rev 405)
@@ -5,26 +5,23 @@
@DPATCH@
-diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Installer/linux/vboxnet.sh.in virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in
---- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Installer/linux/vboxnet.sh.in 2008-05-09 09:28:11.000000000 +0000
-+++ virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in 2008-05-09 09:28:41.000000000 +0000
-@@ -20,10 +20,10 @@
+diff -Naurp virtualbox-ose-2.1.0-dfsg.orig/src/VBox/Installer/linux/vboxdrv.sh.in virtualbox-ose-2.1.0-dfsg/src/VBox/Installer/linux/vboxdrv.sh.in
+--- virtualbox-ose-2.1.0-dfsg.orig/src/VBox/Installer/linux/vboxdrv.sh.in 2008-05-09 09:28:11.000000000 +0000
++++ virtualbox-ose-2.1.0-dfsg/src/VBox/Installer/linux/vboxdrv.sh.in 2008-05-09 09:28:41.000000000 +0000
+@@ -19,8 +19,8 @@
#
### BEGIN INIT INFO
- # Provides: vboxnet
--# Required-Start: $network
+ # Provides: vboxdrv
+-# Required-Start: $syslog
-# Required-Stop:
+# Required-Start: $remote_fs $network
+# Required-Stop: $remote_fs
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
- # Description: VirtualBox permanent host networking setup
- ### END INIT INFO
-
-@@ -50,14 +50,13 @@ if [ -z "$NOLSB" ]; then
+ # Short-Description: VirtualBox Linux kernel module
+@@ -61,13 +61,12 @@
. /lib/lsb/init-functions
fail_msg() {
- [ -f "$VARFILE" ] && rm $VARFILE
- echo ""
- log_failure_msg "$1"
+ log_action_end_msg 1
Modified: virtualbox-ose/trunk/debian/patches/09-initscript.dpatch
===================================================================
--- virtualbox-ose/trunk/debian/patches/09-initscript.dpatch 2008-12-18 11:50:09 UTC (rev 404)
+++ virtualbox-ose/trunk/debian/patches/09-initscript.dpatch 2008-12-18 15:39:00 UTC (rev 405)
@@ -5,80 +5,42 @@
@DPATCH@
-diff -Naurp virtualbox-ose-2.0.4-dfsg.orig/src/VBox/Installer/linux/vboxnet.sh.in virtualbox-ose-2.0.4-dfsg/src/VBox/Installer/linux/vboxnet.sh.in
---- virtualbox-ose-2.0.4-dfsg.orig/src/VBox/Installer/linux/vboxnet.sh.in 2008-11-21 12:44:47.000000000 +0000
-+++ virtualbox-ose-2.0.4-dfsg/src/VBox/Installer/linux/vboxnet.sh.in 2008-11-21 12:45:40.000000000 +0000
-@@ -34,7 +34,12 @@
- TAPDEV="/dev/net/tun"
+diff -Naurp virtualbox-ose-2.1.0-dfsg.orig/src/VBox/Installer/linux/vboxdrv.sh.in virtualbox-ose-2.1.0-dfsg/src/VBox/Installer/linux/vboxdrv.sh.in
+--- virtualbox-ose-2.1.0-dfsg.orig/src/VBox/Installer/linux/vboxdrv.sh.in 2008-12-18 16:30:08.000000000 +0100
++++ virtualbox-ose-2.1.0-dfsg/src/VBox/Installer/linux/vboxdrv.sh.in 2008-12-18 16:36:51.000000000 +0100
+@@ -32,7 +32,8 @@
+ LOG="/var/log/vbox-install.log"
NOLSB=%NOLSB%
-[ -f /lib/lsb/init-functions ] || NOLSB=yes
+# Include virtualbox-ose defaults if available
-+if [ -f /etc/default/virtualbox-ose ] ; then
-+ . /etc/default/virtualbox-ose
-+fi
-+
-+[ -f /lib/lsb/init-functions ] && NOLSB=
++[ -f /etc/default/virtualbox-ose ] && . /etc/default/virtualbox-ose
+ [ -f /etc/vbox/vbox.cfg ] && . /etc/vbox/vbox.cfg
- if [ -n "$NOLSB" ]; then
- if [ -f /etc/redhat-release ]; then
-@@ -168,13 +173,6 @@
- if ! VBoxTunctl -h 2>&1 | grep VBoxTunctl > /dev/null; then
- failure "VBoxTunctl not found"
- fi
-- # Fail if we don't have the kernel tun device
-- # Make sure that the tun module is loaded (Ubuntu 7.10 needs this)
-- modprobe tun > /dev/null 2>&1
-- if ! cat /proc/misc 2>/dev/null | grep tun > /dev/null; then
-- failure "Linux tun/tap subsystem not available"
-- fi
-- succ_msg
- # Read the configuration file entries line by line and create the
- # interfaces
- while read line; do
-@@ -185,6 +183,19 @@
- # or two non-comment entries, possibly followed by a comment).
- if ((! expr match "$2" "#" > /dev/null) &&
- (test -z "$4" || expr match "$4" "#" > /dev/null)); then
-+ if [ "$module_available" != 1 ]
-+ then
-+ # Fail if we don't have the kernel tun device
-+ # Make sure that the tun module is loaded (Ubuntu 7.10 needs this)
-+ # We only test this once, but we have to do it here, because otherwise an empty
-+ # configuration file would trigger the modprobe too.
-+ modprobe tun > /dev/null 2>&1
-+ if ! cat /proc/misc 2>/dev/null | grep tun > /dev/null
-+ then
-+ failure "Linux tun/tap subsystem not available"
+ if [ -n "$INSTALL_DIR" ]; then
+@@ -150,8 +151,10 @@
+ if ! rm -f $DEVICE; then
+ failure "Cannot remove $DEVICE"
+ fi
+- if ! modprobe vboxdrv > /dev/null 2>&1; then
+- failure "modprobe vboxdrv failed. Please use 'dmesg' to find out why"
++ if [ "$LOAD_VBOXDRV_MODULE" = 1 ]; then
++ if ! modprobe vboxdrv > /dev/null 2>&1; then
++ failure "modprobe vboxdrv failed. Please use 'dmesg' to find out why"
+ fi
-+ module_available=1
-+ fi
- # Name our parameters, to make this script slightly less unreadable
- interface=$1
- user=$2
-@@ -238,6 +249,7 @@
fi
- fi
- done < "$CONFIG"
-+ succ_msg
- return 0
- }
-
-@@ -331,10 +343,17 @@
-
- case "$1" in
- start)
-+ # try to insert module but do not fail if not possible
+ sleep .2
+ fi
+@@ -181,8 +184,10 @@
+ rmmod vboxdrv 2>/dev/null
+ failure "Cannot change owner $GROUPNAME for device $DEVICE"
+ fi
+- if ! modprobe vboxnetflt > /dev/null 2>&1; then
+- failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out why"
+ if [ "$LOAD_VBOXDRV_MODULE" = 1 ]; then
-+ /sbin/modprobe -q vboxdrv || true
-+ fi
- start_network
- ;;
- stop)
- stop_network
-+ if [ "$LOAD_VBOXDRV_MODULE" = 1 ]; then
-+ /sbin/modprobe -qr vboxdrv || true
-+ fi
- ;;
- restart|reload)
- stop_network && start_network
++ if ! modprobe vboxnetflt > /dev/null 2>&1; then
++ failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out why"
++ fi
+ fi
+ succ_msg
+ }
Modified: virtualbox-ose/trunk/debian/virtualbox-ose.default
===================================================================
--- virtualbox-ose/trunk/debian/virtualbox-ose.default 2008-12-18 11:50:09 UTC (rev 404)
+++ virtualbox-ose/trunk/debian/virtualbox-ose.default 2008-12-18 15:39:00 UTC (rev 405)
@@ -6,6 +6,6 @@
# This is a POSIX shell fragment
#
-# Set this to 1 if you would like the vboxdrv module to be loaded by
+# Set this to 1 if you would like the virtualbox-ose modules to be loaded by
# the init script.
LOAD_VBOXDRV_MODULE=0
More information about the Pkg-virtualbox-commits
mailing list