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

[Filippo Giunchedi]

Author: filippo
Date: 2010-07-03 17:25:17 +0000 (Sat, 03 Jul 2010)
New Revision: 249

Modified:
   vde2/trunk/debian/changelog
   vde2/trunk/debian/network/if-post-down.d/vde2
   vde2/trunk/debian/network/if-pre-up.d/vde2
Log:
Fix "Timing issue in /etc/network/if-pre-up.d/vde2" by calling vde_tunctl
in ifupdown hooks (Closes: #568363)

Modified: vde2/trunk/debian/changelog
===================================================================
--- vde2/trunk/debian/changelog	2010-07-03 16:44:53 UTC (rev 248)
+++ vde2/trunk/debian/changelog	2010-07-03 17:25:17 UTC (rev 249)
@@ -6,8 +6,10 @@
     and --localstate dir instead
   * Drop soname from libvdeplug3-dev, easier for package build-depending on
     the library
+  * Fix "Timing issue in /etc/network/if-pre-up.d/vde2" by calling vde_tunctl
+    in ifupdown hooks (Closes: #568363)
 
- -- Filippo Giunchedi <filippo at debian.org>  Sat, 03 Jul 2010 16:21:08 +0100
+ -- Filippo Giunchedi <filippo at debian.org>  Sat, 03 Jul 2010 18:24:19 +0100
 
 vde2 (2.2.3-3) unstable; urgency=low
 

Modified: vde2/trunk/debian/network/if-post-down.d/vde2
===================================================================
--- vde2/trunk/debian/network/if-post-down.d/vde2	2010-07-03 16:44:53 UTC (rev 248)
+++ vde2/trunk/debian/network/if-post-down.d/vde2	2010-07-03 17:25:17 UTC (rev 249)
@@ -28,6 +28,9 @@
     start-stop-daemon --stop --quiet --pidfile $PIDFILE \
         --oknodo --exec $VDE_SWITCH
     rm -f $PIDFILE
+
+    # set the tap interface to non-persistant, see #568363
+    vde_tunctl -b -d $IFACE 1>/dev/null
 fi
 
 rm -rf $CTLDIR

Modified: vde2/trunk/debian/network/if-pre-up.d/vde2
===================================================================
--- vde2/trunk/debian/network/if-pre-up.d/vde2	2010-07-03 16:44:53 UTC (rev 248)
+++ vde2/trunk/debian/network/if-pre-up.d/vde2	2010-07-03 17:25:17 UTC (rev 249)
@@ -40,6 +40,9 @@
         TAPOPTS="-t $IFACE"
     fi
 
+    # block to make sure the interface exists, see #568363
+    vde_tunctl -b $IFACE 1>/dev/null
+
     start-stop-daemon --start --quiet --pidfile $PIDFILE \
         --exec $VDE_SWITCH -- \
         -s $CTLDIR -m 660 -g $GROUP -p $PIDFILE $TAPOPTS \