update to 2.7.0

[openvswitch.git] / pvepatches / install-systemd-services.patch

diff --git a/pvepatches/install-systemd-services.patch b/pvepatches/install-systemd-services.patch
index 8434b2e4d1649d0d3e7b369aac88a59c75423c9a..2b5bbab17c9e1b0bd20d6f25771cc0cba6586895 100644 (file)
--- a/pvepatches/install-systemd-services.patch
+++ b/pvepatches/install-systemd-services.patch
@@ -1,7 +1,7 @@
-Index: devel/debian/openvswitch-switch.openvswitch-nonetwork.service
+Index: openvswitch-2.7.0/debian/openvswitch-switch.openvswitch-nonetwork.service
 ===================================================================
 --- /dev/null
-+++ devel/debian/openvswitch-switch.openvswitch-nonetwork.service
++++ openvswitch-2.7.0/debian/openvswitch-switch.openvswitch-nonetwork.service
 @@ -0,0 +1,12 @@
 +[Unit]
 +Description=Open vSwitch Internal Unit
@@ -15,10 +15,10 @@ Index: devel/debian/openvswitch-switch.openvswitch-nonetwork.service
 +EnvironmentFile=-/etc/sysconfig/openvswitch
 +ExecStart=/usr/share/openvswitch/scripts/ovs-ctl start --system-id=random $OPTIONS
 +ExecStop=/usr/share/openvswitch/scripts/ovs-ctl stop
-Index: devel/debian/openvswitch-switch.openvswitch.service
+Index: openvswitch-2.7.0/debian/openvswitch-switch.openvswitch.service
 ===================================================================
 --- /dev/null
-+++ devel/debian/openvswitch-switch.openvswitch.service
++++ openvswitch-2.7.0/debian/openvswitch-switch.openvswitch.service
 @@ -0,0 +1,13 @@
 +[Unit]
 +Description=Open vSwitch
@@ -33,12 +33,12 @@ Index: devel/debian/openvswitch-switch.openvswitch.service
 +
 +[Install]
 +WantedBy=multi-user.target
-Index: devel/debian/rules
+Index: openvswitch-2.7.0/debian/rules
 ===================================================================
---- devel.orig/debian/rules
-+++ devel/debian/rules
-@@ -53,7 +53,10 @@ override_dh_install:
-       cp debian/openvswitch-switch.template debian/openvswitch-switch/usr/share/openvswitch/switch/default.template
+--- openvswitch-2.7.0.orig/debian/rules
++++ openvswitch-2.7.0/debian/rules
+@@ -56,7 +56,10 @@ override_dh_install-indep:
+       dh_install
  
  override_dh_installinit:
 -      dh_installinit -R
@@ -49,10 +49,10 @@ Index: devel/debian/rules
  
  override_dh_strip:
        dh_strip --dbg-package=openvswitch-dbg
-Index: devel/debian/control
+Index: openvswitch-2.7.0/debian/control
 ===================================================================
---- devel.orig/debian/control
-+++ devel/debian/control
+--- openvswitch-2.7.0.orig/debian/control
++++ openvswitch-2.7.0/debian/control
 @@ -14,6 +14,7 @@ Build-Depends: graphviz,
                 openssl,
                 procps,
@@ -71,11 +71,11 @@ Index: devel/debian/control
  Description: Open vSwitch switch implementations
   Open vSwitch is a production quality, multilayer, software-based,
   Ethernet virtual switch. It is designed to enable massive network
-Index: devel/debian/automake.mk
+Index: openvswitch-2.7.0/debian/automake.mk
 ===================================================================
---- devel.orig/debian/automake.mk
-+++ devel/debian/automake.mk
-@@ -27,7 +27,6 @@ EXTRA_DIST += \
+--- openvswitch-2.7.0.orig/debian/automake.mk
++++ openvswitch-2.7.0/debian/automake.mk
+@@ -24,7 +24,6 @@ EXTRA_DIST += \
        debian/openvswitch-pki.postrm \
        debian/openvswitch-switch.README.Debian \
        debian/openvswitch-switch.dirs \