# HG changeset patch
# User Tim Deegan <Tim.Deegan@xxxxxxxxxxxxx>
# Date 1168349080 0
# Node ID 2dba70eb5bd5902837ed1e56d4eabd636f364a32
# Parent 9518bff7c76229793086a5bff7c9336e3eabb005
Fix for pygrub path on Solaris.
Signed-off-by: John Levon <john.levon@xxxxxxx>
---
tools/python/xen/xend/XendDomainInfo.py | 4 ++--
tools/python/xen/xend/osdep.py | 5 +++++
2 files changed, 7 insertions(+), 2 deletions(-)
diff -r 9518bff7c762 -r 2dba70eb5bd5 tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py Tue Jan 09 12:04:41 2007 +0000
+++ b/tools/python/xen/xend/XendDomainInfo.py Tue Jan 09 13:24:40 2007 +0000
@@ -37,7 +37,7 @@ from xen.util.blkif import blkdev_uname_
from xen.util.blkif import blkdev_uname_to_file
from xen.util import security
-from xen.xend import balloon, sxp, uuid, image, arch
+from xen.xend import balloon, sxp, uuid, image, arch, osdep
from xen.xend import XendRoot, XendNode, XendConfig
from xen.xend.XendConfig import scrub_password
@@ -1575,7 +1575,7 @@ class XendDomainInfo:
else:
# Boot using bootloader
if not blexec or blexec == 'pygrub':
- blexec = '/usr/bin/pygrub'
+ blexec = osdep.pygrub_path
blcfg = None
for (devtype, devinfo) in self.info.all_devices_sxpr():
diff -r 9518bff7c762 -r 2dba70eb5bd5 tools/python/xen/xend/osdep.py
--- a/tools/python/xen/xend/osdep.py Tue Jan 09 12:04:41 2007 +0000
+++ b/tools/python/xen/xend/osdep.py Tue Jan 09 13:24:40 2007 +0000
@@ -29,8 +29,13 @@ _xend_autorestart = {
"SunOS": False,
}
+_pygrub_path = {
+ "SunOS": "/usr/lib/xen/bin/pygrub"
+}
+
def _get(var, default=None):
return var.get(os.uname()[0], default)
scripts_dir = _get(_scripts_dir, "/etc/xen/scripts")
xend_autorestart = _get(_xend_autorestart)
+pygrub_path = _get(_pygrub_path, "/usr/bin/pygrub")
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home