ia64/xen-unstable

changeset 12134:6a4ac637d8db

[SOLARIS] The hotplug scripts live in a different place on Solaris.

Merged with Xen API Tree

Signed-off-by: John Levon <john.levon@sun.com>
author Alastair Tse <atse@xensource.com>
date Thu Oct 19 11:33:45 2006 +0100 (2006-10-19)
parents 152810b4eefc
children 2732e3f94e2e
files tools/python/xen/util/auxbin.py tools/python/xen/xend/XendRoot.py
line diff
     1.1 --- a/tools/python/xen/util/auxbin.py	Tue Oct 17 18:23:24 2006 +0100
     1.2 +++ b/tools/python/xen/util/auxbin.py	Thu Oct 19 11:33:45 2006 +0100
     1.3 @@ -21,7 +21,7 @@ LIB_64 = "/usr/lib64"
     1.4  LIB_BIN_SUFFIX = "xen/bin"
     1.5  
     1.6  ## The architectures on which the LIB_64 directory is used.  This
     1.7 -# deliberately excludes ia64 and ppc64.
     1.8 +# deliberately excludes ia64 and ppc64, and Solaris.
     1.9  LIB_64_ARCHS = [ 'x86_64', 's390x', 'sparc64']
    1.10  
    1.11  
     2.1 --- a/tools/python/xen/xend/XendRoot.py	Tue Oct 17 18:23:24 2006 +0100
     2.2 +++ b/tools/python/xen/xend/XendRoot.py	Thu Oct 19 11:33:45 2006 +0100
     2.3 @@ -30,7 +30,7 @@ import os.path
     2.4  import string
     2.5  import sys
     2.6  
     2.7 -from xen.xend import sxp, XendLogging
     2.8 +from xen.xend import sxp, osdep, XendLogging
     2.9  from xen.xend.XendError import XendError
    2.10  
    2.11  class XendRoot:
    2.12 @@ -43,10 +43,10 @@ class XendRoot:
    2.13      config_var     = "XEND_CONFIG"
    2.14  
    2.15      """Where network control scripts live."""
    2.16 -    network_script_dir = "/etc/xen/scripts"
    2.17 +    network_script_dir = osdep.scripts_dir
    2.18  
    2.19      """Where block control scripts live."""
    2.20 -    block_script_dir = "/etc/xen/scripts"
    2.21 +    block_script_dir = osdep.scripts_dir
    2.22  
    2.23      """Default path to the log file. """
    2.24      logfile_default = "/var/log/xen/xend.log"