diff options
| author |   Daniel Gryniewicz <dang@gentoo.org> | 2010-01-12 12:58:37 +0000 |
|---|---|---|
| committer | Daniel Gryniewicz <dang@gentoo.org> | 2010-01-12 12:58:37 +0000 |
| commit | 86535388623252245d644a46e3743e8e4e95021f (patch) | |
| tree | 90c2a03e67c061cded972c79e13f16c49be94108 /net-misc/vde | |
| parent | Version bump (diff) | |
| download | gentoo-2-86535388623252245d644a46e3743e8e4e95021f.tar.gz gentoo-2-86535388623252245d644a46e3743e8e4e95021f.tar.bz2 gentoo-2-86535388623252245d644a46e3743e8e4e95021f.zip | |
Make it possible to change the options to vde_switch; bug #300282
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/vde')
| -rw-r--r-- | net-misc/vde/ChangeLog | 8 | ||||
| -rw-r--r-- | net-misc/vde/files/vde.conf | 3 | ||||
| -rw-r--r-- | net-misc/vde/files/vde.init | 6 |
3 files changed, 12 insertions, 5 deletions
diff --git a/net-misc/vde/ChangeLog b/net-misc/vde/ChangeLog index 97e371ac31c4..4c2fdaa512ba 100644 --- a/net-misc/vde/ChangeLog +++ b/net-misc/vde/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/vde -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/ChangeLog,v 1.21 2009/10/21 09:43:46 flameeyes Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/ChangeLog,v 1.22 2010/01/12 12:58:37 dang Exp $ + + 12 Jan 2010; Daniel Gryniewicz <dang@gentoo.org> files/vde.conf, + files/vde.init: + Make it possible to change the options to vde_switch; bug #300282 *vde-2.2.3 (21 Oct 2009) diff --git a/net-misc/vde/files/vde.conf b/net-misc/vde/files/vde.conf index 5dd3cde90b0b..d8794537537c 100644 --- a/net-misc/vde/files/vde.conf +++ b/net-misc/vde/files/vde.conf @@ -5,3 +5,6 @@ VDE_TAP="tap0" # mode and group for the socket VDE_SOCK_CHMOD="770" VDE_SOCK_CHOWN=":qemu" + +# This is the actual options string passed to VDE. Change this at your own risk. +VDE_OPTS="-tap ${VDE_TAP} -daemon" diff --git a/net-misc/vde/files/vde.init b/net-misc/vde/files/vde.init index b790544a50b8..6400f9bbb23a 100644 --- a/net-misc/vde/files/vde.init +++ b/net-misc/vde/files/vde.init @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/files/vde.init,v 1.3 2008/03/11 21:34:49 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/files/vde.init,v 1.4 2010/01/12 12:58:36 dang Exp $ depend() { after net.${VDE_TAP} @@ -12,7 +12,7 @@ start() { ebegin "Starting vde" [ "${VDE_MODPROBE_TUN}" == "yes" ] && modprobe tun start-stop-daemon --start --quiet \ - --exec /usr/bin/vde_switch -- -tap ${VDE_TAP} -daemon + --exec /usr/bin/vde_switch -- ${VDE_OPTS} eend $? "Failed to start vde" chmod -R ${VDE_SOCK_CHMOD} /var/run/vde.ctl chown -R ${VDE_SOCK_CHOWN} /var/run/vde.ctl |