From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 14 Mar 2013 20:43:25 +0000 (+0100)
Subject: openvswitch: Update to 1.9.0.
X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fipfire-3.x.git;a=commitdiff_plain;h=084d572b5e33ddfddb297e75a271a76ee031b8a6

openvswitch: Update to 1.9.0.
---

diff --git a/openvswitch/openvswitch.nm b/openvswitch/openvswitch.nm
index b4dfa3b6e..7b0a0e4ac 100644
--- a/openvswitch/openvswitch.nm
+++ b/openvswitch/openvswitch.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = openvswitch
-version    = 1.7.0
-release    = 3
+version    = 1.9.0
+release    = 1
 
 groups     = Networking/Tools
 url        = http://openvswitch.org/
@@ -29,7 +29,8 @@ build
 
 	configure_options += \
 		--enable-ssl \
-		--with-pkidir=%{sharedstatedir}/openvswitch/pki
+		--with-pkidir=%{sharedstatedir}/openvswitch/pki \
+		OVSKMOD=openvswitch
 
 	install_cmds
 		# Install logrotate file.
diff --git a/openvswitch/systemd/openvswitch.service b/openvswitch/systemd/openvswitch.service
index 6186a8f1a..fc7517d98 100644
--- a/openvswitch/systemd/openvswitch.service
+++ b/openvswitch/systemd/openvswitch.service
@@ -4,7 +4,6 @@ After=syslog.target
 
 [Service]
 Type=oneshot
-ExecStartPre=/usr/share/openvswitch/scripts/ovs-ctl enable-protocol --protocol=gre
 ExecStart=/usr/share/openvswitch/scripts/ovs-ctl --system-id=random start --delete-bridges
 ExecStop=/usr/share/openvswitch/scripts/ovs-ctl stop
 RemainAfterExit=yes