Search for libexec binaries in /usr/lib/xcp/lib as well as /opt/xenso…

…urce/libexec

XSConsoleConfig.py

@@ -47,6 +47,12 @@ def __init__(self):
             if os.path.exists(path):
                 self.helperdir = path
                 break
+
+        self.libexecdir = ''
+        for path in ["/usr/lib/xcp/lib", "/opt/xensource/libexec"]:
+            if os.path.exists(path):
+                self.libexecdir = path
+                break
 
     @classmethod
     def Inst(cls):
@@ -92,6 +98,9 @@ def XECLIPath(self):
     def HelperPath(self):
         return self.helperdir
 
+    def LibexecPath(self):
+        return self.libexecdir
+
 # Import a more specific configuration if available
 if os.path.isfile(sys.path[0]+'/XSConsoleConfigOEM.py'):
     import XSConsoleConfigOEM

plugins-base/XSFeatureDRSchedule.py

@@ -63,7 +63,7 @@ def HandleMethodChoice(self, inChoice):
                 pass
         if inChoice != 'never':
             try:
-                os.symlink("/opt/xensource/libexec/backup-metadata-cron", self.cronPath(inChoice))
+                os.symlink("%s/backup-metadata-cron" % (Config.Inst().LibexecPath()), self.cronPath(inChoice))
                 Layout.Inst().PushDialogue(InfoDialogue(Lang("Metadata Backup Schedule successfully changed to occur ") + inChoice + "."))
             except:
                 XSLogFailure('Failed to create metadata schedule link')

plugins-base/XSFeatureNetworkReset.py

@@ -19,7 +19,7 @@
 from XSConsoleStandard import *
 
 pool_conf = '%s/pool.conf' % (Config.Inst().XCPConfigDir())
-interface_reconfigure = '/opt/xensource/libexec/interface-reconfigure'
+interface_reconfigure = '%s/interface-reconfigure' % (Config.Inst().LibexecPath())
 inventory_file = '/etc/xensource-inventory'
 management_conf = '/etc/firstboot.d/data/management.conf'
 network_reset = '/tmp/network-reset'