From: john.levon@sun.com <john.levon@sun.com>
Date: Fri, 19 Jan 2007 02:19:54 +0000 (-0800)
Subject: Update pygrub for new Solaris directory names.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15371^2~133^2~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e34a812b5dcd3b0bffb5fd8e535031f1d3521567;p=xen.git

Update pygrub for new Solaris directory names.

Signed-off-by: John Levon <john.levon@sun.com>
---

diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub
index a0de67df67..e28c19804a 100644
--- a/tools/pygrub/src/pygrub
+++ b/tools/pygrub/src/pygrub
@@ -503,7 +503,7 @@ def run_grub(file, entry, fs):
 # 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/i86xen/kernel/unix"):
+    if not fs.file_exists("/platform/i86xpv/kernel/unix"):
         return cfg
     
     # darned python
@@ -516,10 +516,10 @@ def sniff_solaris(fs, cfg):
             longmode = True
 
     if not cfg["kernel"]:
-        cfg["kernel"] = "/platform/i86xen/kernel/unix"
+        cfg["kernel"] = "/platform/i86xpv/kernel/unix"
         cfg["ramdisk"] = "/platform/i86pc/boot_archive"
         if longmode:
-            cfg["kernel"] = "/platform/i86xen/kernel/amd64/unix"
+            cfg["kernel"] = "/platform/i86xpv/kernel/amd64/unix"
             cfg["ramdisk"] = "/platform/i86pc/amd64/boot_archive"
 
     # Unpleasant. Typically we'll have 'root=foo -k' or 'root=foo /kernel -k',