[Xen-changelog] [xen-unstable] [SOLARIS] The hotplug scripts live in a different place on Solaris.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Alastair Tse <atse@xxxxxxxxxxxxx>
# Node ID 6a4ac637d8dbbe065554f3bec6018def1b58ae40
# Parent  152810b4eefc2b51fca3e94ed2aa39256c6cb62d
[SOLARIS] The hotplug scripts live in a different place on Solaris.

Merged with Xen API Tree

Signed-off-by: John Levon <john.levon@xxxxxxx>
---
 tools/python/xen/util/auxbin.py   |    2 +-
 tools/python/xen/xend/XendRoot.py |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff -r 152810b4eefc -r 6a4ac637d8db tools/python/xen/util/auxbin.py
--- a/tools/python/xen/util/auxbin.py   Tue Oct 17 18:23:24 2006 +0100
+++ b/tools/python/xen/util/auxbin.py   Thu Oct 19 11:33:45 2006 +0100
@@ -21,7 +21,7 @@ LIB_BIN_SUFFIX = "xen/bin"
 LIB_BIN_SUFFIX = "xen/bin"
 
 ## The architectures on which the LIB_64 directory is used.  This
-# deliberately excludes ia64 and ppc64.
+# deliberately excludes ia64 and ppc64, and Solaris.
 LIB_64_ARCHS = [ 'x86_64', 's390x', 'sparc64']
 
 
diff -r 152810b4eefc -r 6a4ac637d8db tools/python/xen/xend/XendRoot.py
--- a/tools/python/xen/xend/XendRoot.py Tue Oct 17 18:23:24 2006 +0100
+++ b/tools/python/xen/xend/XendRoot.py Thu Oct 19 11:33:45 2006 +0100
@@ -30,7 +30,7 @@ import string
 import string
 import sys
 
-from xen.xend import sxp, XendLogging
+from xen.xend import sxp, osdep, XendLogging
 from xen.xend.XendError import XendError
 
 class XendRoot:
@@ -43,10 +43,10 @@ class XendRoot:
     config_var     = "XEND_CONFIG"
 
     """Where network control scripts live."""
-    network_script_dir = "/etc/xen/scripts"
+    network_script_dir = osdep.scripts_dir
 
     """Where block control scripts live."""
-    block_script_dir = "/etc/xen/scripts"
+    block_script_dir = osdep.scripts_dir
 
     """Default path to the log file. """
     logfile_default = "/var/log/xen/xend.log"

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog