[Pkg-virtualbox-commits] r238 - in trunk/debian: . patches virtualbox-ose-source.files

[meskes at alioth.debian.org]

Author: meskes
Date: 2008-03-10 12:08:05 +0000 (Mon, 10 Mar 2008)
New Revision: 238

Modified:
   trunk/debian/changelog
   trunk/debian/patches/10-initscript.dpatch
   trunk/debian/virtualbox-ose-source.files/rules
Log:
  * Fixed architecture check in virtualbox-ose-source rules file, closes: #469882
  * Added just another patch to the initscript. This patch makes sure the tun
    module is only loaded if it is needed, closes: #470172



Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-03-05 16:21:03 UTC (rev 237)
+++ trunk/debian/changelog	2008-03-10 12:08:05 UTC (rev 238)
@@ -1,3 +1,11 @@
+virtualbox-ose (1.5.6-dfsg-3) unstable; urgency=low
+
+  * Fixed architecture check in virtualbox-ose-source rules file, closes: #469882
+  * Added just another patch to the initscript. This patch makes sure the tun
+    module is only loaded if it is needed, closes: #470172
+
+ -- Michael Meskes <meskes at debian.org>  Mon, 10 Mar 2008 11:35:44 +0100
+
 virtualbox-ose (1.5.6-dfsg-2) unstable; urgency=low
 
   [ Daniel Baumann ]

Modified: trunk/debian/patches/10-initscript.dpatch
===================================================================
--- trunk/debian/patches/10-initscript.dpatch	2008-03-05 16:21:03 UTC (rev 237)
+++ trunk/debian/patches/10-initscript.dpatch	2008-03-10 12:08:05 UTC (rev 238)
@@ -2,7 +2,7 @@
 ## 10-initscript.dpatch by Michael Meskes <meskes at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add modprobe to initscript
+## DP: Some changes to initscript.
 
 @DPATCH@
 diff -urNad virtualbox-ose~/src/VBox/Installer/linux/vboxnet.sh virtualbox-ose/src/VBox/Installer/linux/vboxnet.sh
@@ -35,6 +35,44 @@
  if [ -f /etc/redhat-release ]; then
      system=redhat
  elif [ -f /etc/SuSE-release ]; then
+@@ -173,15 +173,6 @@
+       fail_msg
+       return 1
+     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
+-      fail_msg
+-      return 1
+-    fi
+-    succ_msg
+     # Read the configuration file entries line by line and create the
+     # interfaces
+     while read line
+@@ -195,6 +186,21 @@
+         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 do 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
++			fail_msg
++			return 1
++          	fi
++          	succ_msg
++		module_available=1
++	  fi
+           case $user in
+             +*)
+                 group=`echo $2 | cut -c2-`
 @@ -382,10 +387,17 @@
  
  case "$1" in

Modified: trunk/debian/virtualbox-ose-source.files/rules
===================================================================
--- trunk/debian/virtualbox-ose-source.files/rules	2008-03-05 16:21:03 UTC (rev 237)
+++ trunk/debian/virtualbox-ose-source.files/rules	2008-03-10 12:08:05 UTC (rev 238)
@@ -35,10 +35,11 @@
 # compiler), VERSION (the final package version string), PKGNAME (full
 # package name with KVERS included), DEB_DESTDIR (path to store DEBs)
 
-# Set ARCH so we can cross compile
-ifneq ($(shell echo $(KVERS)|cut -f 3 -d"-"),amd64)
+# Set ARCH so we can cross compile Debian kernel
+ifneq ($(shell echo $(KVERS) | grep 86), )
 	ARCH := i386
-else
+endif
+ifneq ($(shell echo $(KVERS) | grep amd64), )
 	ARCH := x86_64
 endif