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

[meskes at alioth.debian.org]

Author: meskes
Date: 2008-04-23 15:11:53 +0000 (Wed, 23 Apr 2008)
New Revision: 254

Modified:
   trunk/debian/changelog
   trunk/debian/patches/08-init-fail.dpatch
Log:
Added patch by Pascal Volk <user at localhost.localdomain.org> to prevent init script from overwriting values.



Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-04-23 14:57:38 UTC (rev 253)
+++ trunk/debian/changelog	2008-04-23 15:11:53 UTC (rev 254)
@@ -1,6 +1,8 @@
 virtualbox-ose (1.5.6-dfsg-7) unstable; urgency=low
 
   * Made virtualbox-ose-modules recommend virtualbox-ose-guest-utils.
+  * Added patch by Pascal Volk <user at localhost.localdomain.org> to prevent
+    init script from overwriting values, closes: #475193
 
  -- Michael Meskes <meskes at debian.org>  Wed, 23 Apr 2008 16:56:49 +0200
 

Modified: trunk/debian/patches/08-init-fail.dpatch
===================================================================
--- trunk/debian/patches/08-init-fail.dpatch	2008-04-23 14:57:38 UTC (rev 253)
+++ trunk/debian/patches/08-init-fail.dpatch	2008-04-23 15:11:53 UTC (rev 254)
@@ -2,7 +2,7 @@
 ## 08-init-fail.dpatch by Michael Meskes <meskes at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove created file on failure
+## DP: Fix some failures in init script.
 
 @DPATCH@
 diff -urNad virtualbox-ose-1.5.6-dfsg~/src/VBox/Installer/linux/vboxnet.sh virtualbox-ose-1.5.6-dfsg/src/VBox/Installer/linux/vboxnet.sh
@@ -15,4 +15,21 @@
 +    	[ -f "$VARFILE" ] && rm $VARFILE
          echo " ...fail!"
      }
- 
+
+@@ -226,13 +226,13 @@
+                 then
+                   if brctl addif "$3" "$1" 2> /dev/null
+                   then
+-                    echo "$1 $2 $3" > "$VARFILE"
++                    echo "$1 $2 $3" >> "$VARFILE"
+                   else
+-                    echo "$1 $2" > "$VARFILE"
++                    echo "$1 $2" >> "$VARFILE"
+                     echo "Warning - failed to add interface $1 to the bridge $3"
+                   fi
+                 else
+-                  echo "$1 $2" > $VARFILE
++                  echo "$1 $2" >> $VARFILE
+                 fi
+                 i=20
+               else