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

[meskes at alioth.debian.org]

Author: meskes
Date: 2008-03-03 12:56:54 +0000 (Mon, 03 Mar 2008)
New Revision: 235

Added:
   trunk/debian/patches/08-init-fail.dpatch
Modified:
   trunk/debian/changelog
   trunk/debian/patches/00list
   trunk/debian/patches/02-2.6.25.dpatch
Log:
Fixed path in patch 02-2.6.25.dpatch.
Added patch 08-init-fail.dpatch to remove a newly created file upon failure in initscript.



Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-03-02 12:44:49 UTC (rev 234)
+++ trunk/debian/changelog	2008-03-03 12:56:54 UTC (rev 235)
@@ -8,6 +8,8 @@
   * Added patch by Frans Pop <elendil at planet.nl> to make modules compile with
     kernel 2.6.25, closes: #468864
   * Suggest bridge-utils which is needed for static host networking.
+  * Added patch against init script to remove newly created file again on
+    failure, closes: #468419
 
  -- Michael Meskes <meskes at debian.org>  Sun, 02 Mar 2008 10:38:31 +0100
 

Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	2008-03-02 12:44:49 UTC (rev 234)
+++ trunk/debian/patches/00list	2008-03-03 12:56:54 UTC (rev 235)
@@ -5,5 +5,6 @@
 05-vboxdrv-references.dpatch
 06-vboxadd-udev.dpatch
 07-xsession.dpatch
+08-init-fail.dpatch
 10-initscript.dpatch
 

Modified: trunk/debian/patches/02-2.6.25.dpatch
===================================================================
--- trunk/debian/patches/02-2.6.25.dpatch	2008-03-02 12:44:49 UTC (rev 234)
+++ trunk/debian/patches/02-2.6.25.dpatch	2008-03-03 12:56:54 UTC (rev 235)
@@ -5,9 +5,9 @@
 
 @DPATCH@
 
-diff -ur virtualbox-ose_1.5.6/r0drv/linux/the-linux-kernel.h virtualbox-ose/r0drv/linux/the-linux-kernel.h
---- virtualbox-ose_1.5.6/r0drv/linux/the-linux-kernel.h	2008-02-23 11:10:06.000000000 +0100
-+++ virtualbox-ose/r0drv/linux/the-linux-kernel.h	2008-02-27 01:57:20.000000000 +0100
+diff -ur virtualbox-ose_1.5.6/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h virtualbox-ose/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+--- virtualbox-ose_1.5.6/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h	2008-02-23 11:10:06.000000000 +0100
++++ virtualbox-ose/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h	2008-02-27 01:57:20.000000000 +0100
 @@ -225,12 +225,16 @@
  #undef bool
  
@@ -27,9 +27,9 @@
 +
  #endif
  
-diff -ur virtualbox-ose_1.5.6/linux/SUPDrv-linux.c virtualbox-ose/linux/SUPDrv-linux.c
---- virtualbox-ose_1.5.6/linux/SUPDrv-linux.c	2008-02-23 11:10:05.000000000 +0100
-+++ virtualbox-ose/linux/SUPDrv-linux.c	2008-02-27 01:54:17.000000000 +0100
+diff -ur virtualbox-ose_1.5.6/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c virtualbox-ose/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
+--- virtualbox-ose_1.5.6/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c	2008-02-23 11:10:05.000000000 +0100
++++ virtualbox-ose/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c	2008-02-27 01:54:17.000000000 +0100
 @@ -2069,6 +2069,17 @@
  /* GCC C++ hack. */
  unsigned __gxx_personality_v0 = 0xcccccccc;

Added: trunk/debian/patches/08-init-fail.dpatch
===================================================================
--- trunk/debian/patches/08-init-fail.dpatch	                        (rev 0)
+++ trunk/debian/patches/08-init-fail.dpatch	2008-03-03 12:56:54 UTC (rev 235)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 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
+
+ at DPATCH@
+
+--- virtualbox-ose-1.5.6-dfsg/src/VBox/Installer/linux/vboxnet.sh.orig	2008-03-03 13:47:31.000000000 +0100
++++ virtualbox-ose-1.5.6-dfsg/src/VBox/Installer/linux/vboxnet.sh	2008-03-03 13:47:46.000000000 +0100
+@@ -97,6 +97,7 @@
+ 
+ if [ "$system" = "other" ]; then
+     fail_msg() {
++    	[ -f "$VARFILE" ] && rm $VARFILE
+         echo " ...fail!"
+     }
+