[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 084d572b5e33ddfddb297e75a271a76ee031b8a6

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 084d572b5e33ddfddb297e75a271a76ee031b8a6

[git]

[-- Attachment #1: Type: text/plain, Size: 2346 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  084d572b5e33ddfddb297e75a271a76ee031b8a6 (commit)
      from  fcbfd1446996f138b07552fdea9723579c7f9425 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 084d572b5e33ddfddb297e75a271a76ee031b8a6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Mar 14 21:43:25 2013 +0100

    openvswitch: Update to 1.9.0.

-----------------------------------------------------------------------

Summary of changes:
 openvswitch/openvswitch.nm              | 7 ++++---
 openvswitch/systemd/openvswitch.service | 1 -
 2 files changed, 4 insertions(+), 4 deletions(-)

Difference in files:
diff --git a/openvswitch/openvswitch.nm b/openvswitch/openvswitch.nm
index b4dfa3b..7b0a0e4 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 6186a8f..fc7517d 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


hooks/post-receive
--
IPFire 3.x development tree