Make it possible to change the options to vde_switch; bug #300282

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 19 insertions, 12 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/Manifest b/net-misc/vde/Manifest
index 1f7d84a430f3..40ecac21bb96 100644
--- a/net-misc/vde/Manifest
+++ b/net-misc/vde/Manifest
@@ -5,8 +5,8 @@ AUX Unixterm_20070403.patch 5054 RMD160 76a8200d0975aa172f39a6937799a5ef2b9bbd40
 AUX vde-2.1.6-gcc43.patch 1010 RMD160 0b3d0872a6ed18fe5bc5e9cebb586194c461b206 SHA1 2983befee2e55ef596c1666ceef3c72290eb672c SHA256 00b6d858a0a5e196555ce5574b9e98ea27b34e737ab1afdfc691b600770465ab
 AUX vde-2.2.2-gcc43.patch 1867 RMD160 e5587fa07b9c8e8caa3f2f03b2dca7f2858478a2 SHA1 cc22e018d5347cae34f430e2f6075b56c0c797d5 SHA256 313a1c3477241adfaf0547577457de669b369a1e83876e1c494d64e0524a4463
 AUX vde-2.2.2-slirpvde-buffer-overflow.patch 1427 RMD160 3baca367b80d0b80f87135f4527915a1951a6162 SHA1 bcc6000255658e89f209222f56d53731f9d58866 SHA256 4e21492c1ca73bba9adcd1e17f6b51b15912631ce18042bf9d2a0b618c0056d0
-AUX vde.conf 187 RMD160 7d3a650dba0d33401095d444cda3230c5fa8f963 SHA1 0ad41e477982d4eba8afa07d183eb6ed55116eab SHA256 00ff15f4850f8afda12dacfe548a29d70a3d504513066e66a6570b88851c858f
-AUX vde.init 748 RMD160 085fb762b9d58b1bb20d8dcd6556b0894bf08a7e SHA1 ebf9963efae6bf012f5ea2b4aa2914928866c338 SHA256 20d3370dc6bdaac5ab5288815223857bb37696c30dbf31d1a613df4e426e2070
+AUX vde.conf 305 RMD160 844283848ec1a05cd471a5dae9ffcd7b6c3d1297 SHA1 60f6a47b947160d7fb0e40299ca7d85f800a6778 SHA256 821da54d238d80324677df7d6647a2224984bf80d292b20655cf374c16e44424
+AUX vde.init 733 RMD160 2e197f79b8a93e2bcf2fcc69f6eb2ee229c148ae SHA1 a11051d77fda5ac98c5502936c9d593890fd260f SHA256 e8dfaab2d00625ffe72e62df60309ab238fd51f6cd0e7516814f5dc3126e657b
 DIST vde-1.5.7.tgz 139314 RMD160 213f87ea465b76c276b660f0b0733820273f5ca7 SHA1 81fc285e56b431a13220e8c8df80b492482b5158 SHA256 a80d907c1705e9b4f5eb62593753f5120e8e71066395fa3241eb425825ccf82b
 DIST vde-2.0.2.tar.bz2 382162 RMD160 c15ef9f3743538c2dd1bd0ba99c8078741302100 SHA1 8cdbd63e3214dd24f0fe987c0d9ccde57ae9db6a SHA256 05b473815f9706387a3c5eaeb4da2e492f624e0b7783432179454f9d69bb973c
 DIST vde2-2.1.1.tar.bz2 392083 RMD160 ca566899c5bf21c1e5302fb7f1b815d87b4655a3 SHA1 9878a9539bd9be1e2f48832698d31e7f7ad78f85 SHA256 bd6096cecaf0b11c5bf817842e633683efce8f62e408ccace896b05be665242c
@@ -20,12 +20,12 @@ EBUILD vde-2.1.6-r1.ebuild 1232 RMD160 aa471f5cbd545b784acfe95e0d9a20e5c02c74ff
 EBUILD vde-2.1.6.ebuild 1099 RMD160 07755732ad3c5cd8c2494d335f20bbef31452419 SHA1 ed9ac22b2e39dbbbf1e91bab245b583ddb46f719 SHA256 dc83def2128b6ae678997429774e7023e4d36e0b078d979f0f56ef2c8cf10e09
 EBUILD vde-2.2.2.ebuild 1399 RMD160 6fba9ef937f1f6199cee570810fba0ef4d5edf58 SHA1 0c2b8d69d242ee75b9bf04160938ac3c6a2a47c1 SHA256 59f6e1222b4207180b1056cc9ab18ec5f61634b7fd80233f04f4920c592f5090
 EBUILD vde-2.2.3.ebuild 1312 RMD160 c6927d86a0550e6ebfa360df5175c754f50146c5 SHA1 2075b4d5f5cd8489e139d21d38c3a33fb0aaf366 SHA256 f6cd422209c768660bf4c0045d52338379041f246322c6a9270330f5d93e6a9a
-MISC ChangeLog 3895 RMD160 05d0f34c65e85eb2791e27ed5355caaa108d9654 SHA1 ecb5e890758f01a24ddf5bf552d704cbb8af1740 SHA256 bebafacfdb1a85824e10eeb7949d7c934e5d004d1e15e13b91fcc06fc9e47c6e
+MISC ChangeLog 4044 RMD160 c048cf8aa1ff871c12c27735580a5c75b0163a89 SHA1 4f9f6b0b284a92c8a46c535cf75dbc0f1c0125f7 SHA256 23e251f60d03ac823101b296808f91c52f00ee756d95531fde7475f67b776522
 MISC metadata.xml 606 RMD160 1f06550336fb142473cfce1189cfaa4e48e07c4c SHA1 73839c97284da922fbbc3a0b8ee831cf8c49da06 SHA256 5d2110fbf67918bdb0ef10077fc9f57add5aa2ad0091a9d6bb5064667d45d9a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkre19EACgkQAiZjviIA2Xgb5gCg5afHMCcfVKX33Uiwjubs1yHK
-KJIAoLTZHIVxzV1+HDuPxHFMsrrN8gb1
-=l9WZ
+iEYEARECAAYFAktMccIACgkQomPajV0RnrFyXACfUNCujHpbXRfL3gaOpcYF3BAN
+UNcAn3lq++jPrDYO4dUDoAw5zAmIifKy
+=mgWC
 -----END PGP SIGNATURE-----
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