diff options
| author |   Matthew Thode <prometheanfire@gentoo.org> | 2013-11-18 03:08:16 +0000 |
|---|---|---|
| committer | Matthew Thode <prometheanfire@gentoo.org> | 2013-11-18 03:08:16 +0000 |
| commit | 9c11e4fde47be5db0280ef914f134021dde23598 (patch) | |
| tree | 3816e25c24952d073e66db2d7507d09e314f161e /net-misc/openvswitch | |
| parent | Version bump. Add ruby20 target. ppc64 keyword dropped. Rekeywording in bug #... (diff) | |
| download | gentoo-2-9c11e4fde47be5db0280ef914f134021dde23598.tar.gz gentoo-2-9c11e4fde47be5db0280ef914f134021dde23598.tar.bz2 gentoo-2-9c11e4fde47be5db0280ef914f134021dde23598.zip | |
fixing bug 491238
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)
Diffstat (limited to 'net-misc/openvswitch')
| -rw-r--r-- | net-misc/openvswitch/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/openvswitch/files/ovsdb-server_conf2 | 17 | ||||
| -rw-r--r-- | net-misc/openvswitch/openvswitch-2.0.0.ebuild | 4 |
3 files changed, 24 insertions, 3 deletions
diff --git a/net-misc/openvswitch/ChangeLog b/net-misc/openvswitch/ChangeLog index aee5b9d7162f..d2d8928cb819 100644 --- a/net-misc/openvswitch/ChangeLog +++ b/net-misc/openvswitch/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/openvswitch # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/ChangeLog,v 1.14 2013/11/11 02:58:44 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/ChangeLog,v 1.15 2013/11/18 03:08:16 prometheanfire Exp $ + + 18 Nov 2013; Matthew Thode <prometheanfire@gentoo.org> + +files/ovsdb-server_conf2, openvswitch-2.0.0.ebuild: + fixing bug 491238 *openvswitch-2.0.0 (11 Nov 2013) diff --git a/net-misc/openvswitch/files/ovsdb-server_conf2 b/net-misc/openvswitch/files/ovsdb-server_conf2 new file mode 100644 index 000000000000..77d853b7a17d --- /dev/null +++ b/net-misc/openvswitch/files/ovsdb-server_conf2 @@ -0,0 +1,17 @@ +# Socket for bringing the server up +DB_SOCKET="/var/run/openvswitch/db.sock" + +# Remote sockets are defined in the database by default +REMOTE_DB="db:Open_vSwitch,manager_options" +REMOTE_DB="db:Open_vSwitch,Open_vSwitch,manager_options" + +# All certificates and keys are stored in the database (if any) +PRIVATE_KEY="db:Open_vSwitch,SSL,private_key" +CERTIFICATE="db:Open_vSwitch,SSL,certificate" +BOOTSTRAP_CA_CERT="db:Open_vSwitch,SSL,ca_cert" + +# Alternative path for the database (default is /etc/openvswitch/conf.db) +# DATABASE="/etc/openvswitch/conf.db" + +# Additional options +# OPTIONS="" diff --git a/net-misc/openvswitch/openvswitch-2.0.0.ebuild b/net-misc/openvswitch/openvswitch-2.0.0.ebuild index c44268903653..685b73f48e47 100644 --- a/net-misc/openvswitch/openvswitch-2.0.0.ebuild +++ b/net-misc/openvswitch/openvswitch-2.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/openvswitch-2.0.0.ebuild,v 1.1 2013/11/11 02:58:44 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/openvswitch-2.0.0.ebuild,v 1.2 2013/11/18 03:08:16 prometheanfire Exp $ EAPI=5 @@ -102,7 +102,7 @@ src_install() { use monitor || rmdir "${ED}/usr/share/ovsdbmonitor" use debug || rm "${ED}/usr/bin/ovs-parse-leaks" - newconfd "${FILESDIR}/ovsdb-server_conf" ovsdb-server + newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd newconfd "${FILESDIR}/ovs-controller_conf" ovs-controller newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server |