[Pkg-xen-changes] [xen] 08/15: tools-pygrub-remove-static-solaris-support
Ian Campbell
ijc-guest at moszumanska.debian.org
Mon Jul 7 10:52:22 UTC 2014
This is an automated email from the git hooks/post-receive script.
ijc-guest pushed a commit to branch feature/4.4-updates
in repository xen.
commit e793a9f5ce7186d1f6dc89b0f166218dec931af2
Author: Bastian Blank <waldi at debian.org>
Date: Sat Jul 5 11:47:29 2014 +0200
tools-pygrub-remove-static-solaris-support
---
tools/pygrub/src/pygrub | 51 +------------------------------------------------
1 file changed, 1 insertion(+), 50 deletions(-)
diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub
index 111750b..cd493b7 100644
--- a/tools/pygrub/src/pygrub
+++ b/tools/pygrub/src/pygrub
@@ -17,7 +17,6 @@ import os, sys, string, struct, tempfile, re, traceback
import copy
import logging
import platform
-import xen.lowlevel.xc
import curses, _curses, curses.wrapper, curses.textpad, curses.ascii
import getopt
@@ -640,51 +639,6 @@ def run_grub(file, entry, fs, cfg_args):
return grubcfg
-def supports64bitPVguest():
- xc = xen.lowlevel.xc.xc()
- caps = xc.xeninfo()['xen_caps'].split(" ")
- for cap in caps:
- if cap == "xen-3.0-x86_64":
- return True
- return False
-
-# If nothing has been specified, look for a Solaris domU. If found, perform the
-# necessary tweaks.
-def sniff_solaris(fs, cfg):
- if not fs.file_exists("/platform/i86xpv/kernel/unix") and \
- not fs.file_exists("/platform/i86xpv/kernel/amd64/unix"):
- return cfg
-
- if not cfg["kernel"]:
- if supports64bitPVguest() and \
- fs.file_exists("/platform/i86xpv/kernel/amd64/unix"):
- cfg["kernel"] = "/platform/i86xpv/kernel/amd64/unix"
- cfg["ramdisk"] = "/platform/i86pc/amd64/boot_archive"
- elif fs.file_exists("/platform/i86xpv/kernel/unix"):
- cfg["kernel"] = "/platform/i86xpv/kernel/unix"
- cfg["ramdisk"] = "/platform/i86pc/boot_archive"
- else:
- return cfg
-
- # Unpleasant. Typically we'll have 'root=foo -k' or 'root=foo /kernel -k',
- # and we need to maintain Xen properties (root= and ip=) and the kernel
- # before any user args.
-
- xenargs = ""
- userargs = ""
-
- if not cfg["args"]:
- cfg["args"] = cfg["kernel"]
- else:
- for arg in cfg["args"].split():
- if re.match("^root=", arg) or re.match("^ip=", arg):
- xenargs += arg + " "
- elif arg != cfg["kernel"]:
- userargs += arg + " "
- cfg["args"] = xenargs + " " + cfg["kernel"] + " " + userargs
-
- return cfg
-
def sniff_netware(fs, cfg):
if not fs.file_exists("/nwserver/xnloader.sys"):
return cfg
@@ -858,10 +812,7 @@ if __name__ == "__main__":
try:
fs = fsimage.open(file, offset, bootfsoptions)
- chosencfg = sniff_solaris(fs, incfg)
-
- if not chosencfg["kernel"]:
- chosencfg = sniff_netware(fs, incfg)
+ chosencfg = sniff_netware(fs, incfg)
if not chosencfg["kernel"]:
chosencfg = run_grub(file, entry, fs, incfg["args"])
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xen/xen.git
More information about the Pkg-xen-changes
mailing list