[gentoo-commits] gentoo-x86 commit in net-misc/openvswitch/files: xcp-interface-reconfigure-2.3.2.patch

[Matt Thode (prometheanfire)]

prometheanfire    15/07/29 22:36:21

  Added:                xcp-interface-reconfigure-2.3.2.patch
  Log:
  bup
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x33ED3FD25AFC78BA)

Revision  Changes    Path
1.1                  net-misc/openvswitch/files/xcp-interface-reconfigure-2.3.2.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvswitch/files/xcp-interface-reconfigure-2.3.2.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvswitch/files/xcp-interface-reconfigure-2.3.2.patch?rev=1.1&content-type=text/plain

Index: xcp-interface-reconfigure-2.3.2.patch
===================================================================
Description: Use xcp-xapi interface-reconfigure if found
 Ubuntu/Debian provide the XCP interface-reconfigure hook in
 a FHS compliant location; use this if found.
Author: James Page <james.page@××××××.com>
Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/openvswitch/+bug/1195053
Forwarded: no

--- a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
+++ b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
@@ -43,6 +43,10 @@ def delete_cacert():
 def update(session, args):
     # Refresh bridge network UUIDs in case this host joined or left a pool.
     script = '/opt/xensource/libexec/interface-reconfigure'
+    # NOTE(jamespage): Override with distro xcp xapi locations
+    # if present
+    if os.path.exists('/usr/lib/xcp/lib/interface-reconfigure'):
+        script = '/usr/lib/xcp/lib/interface-reconfigure'
     try:
         retval = subprocess.call([script, 'rewrite'])
         if retval != 0: