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

[meskes at alioth.debian.org]

Author: meskes
Date: 2007-11-18 11:34:59 +0000 (Sun, 18 Nov 2007)
New Revision: 115

Added:
   trunk/debian/patches/09-quiet-grep.dpatch
Modified:
   trunk/debian/changelog
   trunk/debian/patches/00list
   trunk/debian/virtualbox-ose-guest-source.postinst.modules.in
   trunk/debian/virtualbox-ose-source.postinst.modules.in
Log:
Call "invoke-rc.d udev reload" conditionally in modules postinst.
Do not call modprobe in postinst script.
Made grep command in vboxnet.sh be quiet.



Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-11-17 14:47:37 UTC (rev 114)
+++ trunk/debian/changelog	2007-11-18 11:34:59 UTC (rev 115)
@@ -5,6 +5,9 @@
   * Also removed build dependency on libxerces27-dev because libxalan110-dev
     depends on it.
   * Remove guest libs from debug package.
+  * Call "invoke-rc.d udev reload" conditionally in modules postinst.
+  * Do not call modprobe in postinst script, closes: #451743, #451742
+  * Made grep command in vboxnet.sh be quiet, closes: #451741
 
  -- Michael Meskes <meskes at debian.org>  Thu, 15 Nov 2007 11:35:04 +0100
 

Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	2007-11-17 14:47:37 UTC (rev 114)
+++ trunk/debian/patches/00list	2007-11-18 11:34:59 UTC (rev 115)
@@ -6,4 +6,5 @@
 06-vboxadd-udev.dpatch
 07-xsession.dpatch
 08-no-kernel.dpatch
+09-quiet-grep.dpatch
 

Added: trunk/debian/patches/09-quiet-grep.dpatch
===================================================================
--- trunk/debian/patches/09-quiet-grep.dpatch	                        (rev 0)
+++ trunk/debian/patches/09-quiet-grep.dpatch	2007-11-18 11:34:59 UTC (rev 115)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 09-quiet-grep.dpatch by  <michael at feivel.credativ.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Make grep be quiet
+
+ at DPATCH@
+
+--- ./src/VBox/Installer/linux/vboxnet.sh.orig	2007-11-18 12:29:09.000000000 +0100
++++ ./src/VBox/Installer/linux/vboxnet.sh	2007-11-18 12:29:41.000000000 +0100
+@@ -236,7 +236,7 @@
+     done < "$CONFIG"
+     # Set /dev/net/tun to belong to the group vboxusers if it exists and does
+     # yet belong to a group.
+-    if ls -g "$TAPDEV" 2>/dev/null | grep root
++    if ls -g "$TAPDEV" 2>/dev/null | grep -q root
+     then
+       chgrp vboxusers "$TAPDEV"
+       chmod 0660 "$TAPDEV"

Modified: trunk/debian/virtualbox-ose-guest-source.postinst.modules.in
===================================================================
--- trunk/debian/virtualbox-ose-guest-source.postinst.modules.in	2007-11-17 14:47:37 UTC (rev 114)
+++ trunk/debian/virtualbox-ose-guest-source.postinst.modules.in	2007-11-18 11:34:59 UTC (rev 115)
@@ -8,9 +8,13 @@
 
 case "${1}" in
 	configure)
-		modprobe vboxadd || true
-		modprobe vboxvfs || true
-		invoke-rc.d udev reload
+		if [ -x /etc/init.d/udev ]; then
+			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+				invoke-rc.d udev reload || /bin/true
+			else
+				/etc/init.d/udev reload || /bin/true
+			fi
+		fi
 		;;
 
 	abort-upgrade|abort-deconfigure|abort-remove)

Modified: trunk/debian/virtualbox-ose-source.postinst.modules.in
===================================================================
--- trunk/debian/virtualbox-ose-source.postinst.modules.in	2007-11-17 14:47:37 UTC (rev 114)
+++ trunk/debian/virtualbox-ose-source.postinst.modules.in	2007-11-18 11:34:59 UTC (rev 115)
@@ -6,8 +6,13 @@
 
 case "${1}" in
 	configure)
-		modprobe vboxdrv || true
-		invoke-rc.d udev reload
+		if [ -x /etc/init.d/udev ]; then
+			if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+				invoke-rc.d udev reload || /bin/true
+			else
+				/etc/init.d/udev reload || /bin/true
+			fi
+		fi
 		;;
 
 	abort-upgrade|abort-deconfigure|abort-remove)