openvswitch: Update to 1.9.0.

diff --git a/openvswitch/openvswitch.nm b/openvswitch/openvswitch.nm
index b4dfa3b6eed1b739bbbdfd69569529002d4d5c45..7b0a0e4acbd982c7a927d5ee5923a19cf67c8c0d 100644 (file)
--- 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 6186a8f1a81e4593e20505263d6446ff830fc658..fc7517d982b3598f52bf781c92d2058966e46a86 100644 (file)
--- 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