The hotplug scripts live in a different place on Solaris.
PATCH 1/1 The hotplug scripts live in a different place on Solaris.
# HG changeset patch
# User [email protected]
# Date 1161091351 25200
# Node ID 02317b0c61896c147299f0560ccafa35adabf0eb # Parent 3348121778e4020dac6ee010320e704de0d64f67 The hotplug scripts live in a different place on Solaris.
Signed-off-by John Levon <[email protected]>
tools/python/xen/util/auxbin.py +1 -1
@@ -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']
tools/python/xen/xend/XendRoot.py +3 -2
@@ -30,6 +30,7 @@ import string import string import sys +import osdep import XendLogging from XendError import XendError
@@ -46,10 +47,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"
tools/python/xen/xend/osdep.py new file +27 -0
@@ -0,0 +1,27 @@ +#!/usr/bin/env python +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of version 2.1 of the GNU Lesser General Public +# License as published by the Free Software Foundation. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. + +import os + +_scripts_dir = { + "Linux": "/etc/xen/scripts", + "SunOS": "/usr/lib/xen/scripts", +} + +scripts_dir = _scripts_dir.get(os.uname()[0], "/etc/xen/scripts")