From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Fri, 12 Oct 2018 14:25:30 +0000 (+0100)
Subject: fixup! tools/pygrub: Add `xen' to fsimage python module name
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=refs%2Fheads%2Ft;p=people%2Fiwj%2Fxen.git

fixup! tools/pygrub: Add `xen' to fsimage python module name
---

diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub
index c5bdd8e380..52a8965ad9 100755
--- a/tools/pygrub/src/pygrub
+++ b/tools/pygrub/src/pygrub
@@ -897,7 +897,7 @@ if __name__ == "__main__":
 
     for offset in part_offs:
         try:
-            fs = fsimage.open(file, offset, bootfsoptions)
+            fs = xenfsimage.open(file, offset, bootfsoptions)
 
             chosencfg = sniff_solaris(fs, incfg)
 
@@ -945,7 +945,7 @@ if __name__ == "__main__":
 
     args = None
     if chosencfg["args"]:
-        zfsinfo = fsimage.getbootstring(fs)
+        zfsinfo = xenfsimage.getbootstring(fs)
         if zfsinfo is not None:
             e = re.compile("zfs-bootfs=[\w\-\.\:@/]+" )
             (chosencfg["args"],count) = e.subn(zfsinfo, chosencfg["args"])