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

[filippo at alioth.debian.org]

Author: filippo
Date: 2008-06-13 14:54:19 +0000 (Fri, 13 Jun 2008)
New Revision: 138

Modified:
   vde2/trunk/debian/changelog
   vde2/trunk/debian/network/if-post-down.d/vde2
   vde2/trunk/debian/network/if-pre-up.d/vde2
Log:
remove DAEMON usage and fix version number


Modified: vde2/trunk/debian/changelog
===================================================================
--- vde2/trunk/debian/changelog	2008-06-11 21:07:42 UTC (rev 137)
+++ vde2/trunk/debian/changelog	2008-06-13 14:54:19 UTC (rev 138)
@@ -1,11 +1,13 @@
-vde2 (2.2.0-pre2-2) UNRELEASED; urgency=low
+vde2 (2.2.1-1) UNRELEASED; urgency=low
 
+  * New upstream release
   * Suggest: qemu and kvm as requested in #461514
   * Expand and spell-check README.Debian, add manual method example
   (Closes: #466363)
   * Do not assume MAKEDEV presence in postinst
+  * Remove /usr/bin/daemon usage from ifupdown scripts 
 
- -- Filippo Giunchedi <filippo at debian.org>  Mon, 18 Feb 2008 18:26:04 +0100
+ -- Filippo Giunchedi <filippo at debian.org>  Fri, 13 Jun 2008 14:52:54 +0200
 
 vde2 (2.2.0-pre2-1) unstable; urgency=low
 

Modified: vde2/trunk/debian/network/if-post-down.d/vde2
===================================================================
--- vde2/trunk/debian/network/if-post-down.d/vde2	2008-06-11 21:07:42 UTC (rev 137)
+++ vde2/trunk/debian/network/if-post-down.d/vde2	2008-06-13 14:54:19 UTC (rev 138)
@@ -3,8 +3,6 @@
 VDE_SWITCH=/usr/bin/vde_switch
 SLIRPVDE=/usr/bin/slirpvde
 
-DAEMON=/usr/bin/daemon
-
 # 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
@@ -13,11 +11,7 @@
 PIDFILE="/var/run/vde2/$IFACE-plug.pid"
 CTLFILE="/var/run/vde2/$IFACE.ctl"
 if [ -f $PIDFILE ]; then
-    if [ -x $DAEMON ]; then
-		$DAEMON -n "vde2_plug_$IFACE" -F $PIDFILE --stop
-    else
-		start-stop-daemon --stop --quiet --pidfile $PIDFILE
-    fi
+	start-stop-daemon --stop --quiet --pidfile $PIDFILE
     rm -f $PIDFILE
 fi
 

Modified: vde2/trunk/debian/network/if-pre-up.d/vde2
===================================================================
--- vde2/trunk/debian/network/if-pre-up.d/vde2	2008-06-11 21:07:42 UTC (rev 137)
+++ vde2/trunk/debian/network/if-pre-up.d/vde2	2008-06-13 14:54:19 UTC (rev 138)
@@ -7,7 +7,6 @@
 
 USER=vde2-net
 GROUP=vde2-net
-DAEMON=/usr/bin/daemon
 
 if [ ! -x $VDE_SWITCH ] || [ ! -x $SLIRPVDE ]; then
   exit 0
@@ -51,13 +50,9 @@
     PIDFILE="/var/run/vde2/$IFACE-plug.pid"
     CTLDIR="/var/run/vde2/$IFACE.ctl"
 
-    if [ -x $DAEMON ]; then
-		$DAEMON -n "vde2_plug_$IFACE" -F $PIDFILE -- $DPIPE $VDE_PLUG -g vde2-net -m 660 $CTLDIR = "$@"
-    else
 		start-stop-daemon --start --quiet --pidfile $PIDFILE \
 			--make-pidfile --background \
 			--exec $DPIPE -- $VDE_PLUG -g $GROUP -m 660 $CTLDIR = "$@"
-    fi
 fi
 
 # vde2-slirp [-|<args>]