[Pkg-vsquare-changes] r82 - in vde2/trunk/debian: . network/if-post-down.d network/if-pre-up.d

[Filippo Giunchedi]

Author: filippo
Date: 2007-04-11 09:39:15 +0000 (Wed, 11 Apr 2007)
New Revision: 82

Modified:
   vde2/trunk/debian/
   vde2/trunk/debian/changelog
   vde2/trunk/debian/network/if-post-down.d/vde2
   vde2/trunk/debian/network/if-pre-up.d/vde2
Log:
fix for #418065



Property changes on: vde2/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Modified: vde2/trunk/debian/changelog
===================================================================
--- vde2/trunk/debian/changelog	2007-02-19 08:52:47 UTC (rev 81)
+++ vde2/trunk/debian/changelog	2007-04-11 09:39:15 UTC (rev 82)
@@ -1,10 +1,15 @@
 vde2 (2.1.6-2) unstable; urgency=low
 
+  [ Ludovico Gardenghi ]
   * Fixed a typo in /etc/network/if-pre-up.d/vde2 script (thanks to Scott
     Shedden) (Closes: #411400)
 
- -- Ludovico Gardenghi <ludovico at mefisto>  Mon, 19 Feb 2007 09:51:21 +0100
+  [ Filippo Giunchedi ]
+  * do not check on interface's name being tap*, ignore interface if there are
+    no actual vde2-* parameters, thanks Raphael (Closes: #418065)
 
+ -- Filippo Giunchedi <filippo at debian.org>  Wed, 11 Apr 2007 11:30:20 +0200
+
 vde2 (2.1.6-1) unstable; urgency=low
 
   [ Ludovico Gardenghi ]

Modified: vde2/trunk/debian/network/if-post-down.d/vde2
===================================================================
--- vde2/trunk/debian/network/if-post-down.d/vde2	2007-02-19 08:52:47 UTC (rev 81)
+++ vde2/trunk/debian/network/if-post-down.d/vde2	2007-04-11 09:39:15 UTC (rev 82)
@@ -5,15 +5,10 @@
 
 DAEMON=/usr/bin/daemon
 
-case $IFACE in
-    tap*)
-	# Remainder of script.
-    ;;
-    *)
-	# Not a tun/tap device.
-	exit 0
-    ;;
-esac	
+# this is not an interesting stanza for us
+if [ -z "$IF_VDE2_SWITCH" -a -z "$IF_VDE2_PLUG" -a -z "$IF_VDE2_SLIRP" ]; then
+  exit 0
+fi
 
 PIDFILE="/var/run/vde2/$IFACE-plug.pid"
 CTLFILE="/var/run/vde2/$IFACE.ctl"

Modified: vde2/trunk/debian/network/if-pre-up.d/vde2
===================================================================
--- vde2/trunk/debian/network/if-pre-up.d/vde2	2007-02-19 08:52:47 UTC (rev 81)
+++ vde2/trunk/debian/network/if-pre-up.d/vde2	2007-04-11 09:39:15 UTC (rev 82)
@@ -13,15 +13,10 @@
   exit 0
 fi
 
-case $IFACE in
-    tap*)
-	# Remainder of script.
-    ;;
-    *)
-	# Not a tun/tap device.
-	exit 0
-    ;;
-esac	
+# this is not an interesting stanza for us
+if [ -z "$IF_VDE2_SWITCH" -a -z "$IF_VDE2_PLUG" -a -z "$IF_VDE2_SLIRP" ]; then
+  exit 0
+fi
 
 # Create directory if missing
 if ! [ -d /var/run/vde2 ]; then