From: Wei Kong Subject: [PATCH] pygrub: parse xen module option in grub Date: Fri, 20 Feb 2009 10:40:14 +0800 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0836713303==" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org --===============0836713303== Content-Type: multipart/alternative; boundary=0015174c3c609aa4330463509277 --0015174c3c609aa4330463509277 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Add function for GrubConf to parse xen module option in grub. Pygrub should pass args as domUloader did. Signed-off-by: Wei Kong diff -uNrp a/tools/pygrub/src/GrubConf.py b/tools/pygrub/src/GrubConf.py --- a/tools/pygrub/src/GrubConf.py 2009-02-20 09:59:40.000000000 +0800 +++ b/tools/pygrub/src/GrubConf.py 2009-02-20 10:11:30.000000000 +0800 @@ -12,7 +12,7 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -import os, sys +import os, sys, re import logging def grub_split(s, maxsplit = -1): @@ -91,7 +91,7 @@ class GrubImage(object): self.args, self.initrd)) def reset(self, lines): - self._root = self._initrd = self._kernel = self._args = None + self._root = self._initrd = self._kernel = self._args = self._xen = None self.title = "" self.lines = [] map(self.set_from_line, lines) @@ -120,7 +120,22 @@ class GrubImage(object): return self._root root = property(get_root, set_root) + def set_module(self, val): + if not self._xen: + return + if (val.find('vmlinuz') != -1): + (kernel, args) = val.split(None, 1) + self._kernel = get_path(kernel) + self._args = args + if (val.find('initrd') != -1): + self._initrd = get_path(val) + module = property(None, set_module) + def set_kernel(self, val): + xengz=re.compile(".*xen[\-.0-9]+gz$", re.UNICODE) + if xengz.match(val): + self._xen = True + return if val.find(" ") == -1: self._kernel = get_path(val) self._args = None @@ -147,8 +162,9 @@ class GrubImage(object): "rootnoverify": "root", "kernel": "kernel", "initrd": "initrd", + "module": "module", "chainloader": None, - "module": None} + } class GrubConfigFile(object): diff -uNrp a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub --- a/tools/pygrub/src/pygrub 2009-02-20 09:59:40.000000000 +0800 +++ b/tools/pygrub/src/pygrub 2009-02-20 10:13:54.000000000 +0800 @@ -682,7 +682,7 @@ if __name__ == "__main__": if chosencfg["args"]: zfsinfo = fsimage.getbootstring(fs) if zfsinfo is None: - sxp += "(args \"%s\")" % chosencfg["args"] + sxp += "(args \"%s %s\")" % (chosencfg["args"], incfg["args"]) else: e = re.compile("zfs-bootfs=[\w\-\.\:@/]+" ) (chosencfg["args"],count) = e.subn(zfsinfo, chosencfg["args"]) --0015174c3c609aa4330463509277 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Add function for GrubConf to parse xen module option in grub.
Pygrub sho= uld pass args as domUloader did.

Signed-off-by: Wei Kong <weikong.cn@gmail.com>

diff -uNrp a/tools/pygrub/src/GrubConf.py b/tools/pygrub/src/GrubConf.p= y
--- a/tools/pygrub/src/GrubConf.py    2009-02-20 09:59:= 40.000000000 +0800
+++ b/tools/pygrub/src/GrubConf.py    = 2009-02-20 10:11:30.000000000 +0800
@@ -12,7 +12,7 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA = 02139, USA.
 #
 
-import os, sys
+import os, sys, re<= br> import logging
 
 def grub_split(s, maxsplit =3D -= 1):
@@ -91,7 +91,7 @@ class GrubImage(object):
            &nb= sp;            =            self.args, sel= f.initrd))
 
     def reset(self, lines):-        self._root =3D self._initrd = =3D self._kernel =3D self._args =3D None
+     =    self._root =3D self._initrd =3D self._kernel =3D self._args = =3D self._xen =3D None
         self.title =3D ""= ;
         self.lines =3D []
=          map(self.set_from_line, li= nes)
@@ -120,7 +120,22 @@ class GrubImage(object):
   =       return self._root
    = ; root =3D property(get_root, set_root)
 
+    def set_module(self, val):
+  &n= bsp;     if not self._xen:
+    =         return
+   &nb= sp;    if (val.find('vmlinuz') !=3D -1):
+ &= nbsp;          (kernel, args) = =3D val.split(None, 1)
+        =     self._kernel =3D get_path(kernel)
+            self._a= rgs =3D args
+        if (val.find(&#= 39;initrd') !=3D -1):
+       &nb= sp;    self._initrd =3D get_path(val)
+   = module =3D property(None, set_module)
+
     def= set_kernel(self, val):
+        xeng= z=3Dre.compile(".*xen[\-.0-9]+gz$", re.UNICODE)
+        if xengz.match(val):
+ =            self._xen =3D = True
+           = return
         if val.find(&qu= ot; ") =3D=3D -1:
        &= nbsp;    self._kernel =3D get_path(val)
   = ;          self._args =3D None=
@@ -147,8 +162,9 @@ class GrubImage(object):
            &nb= sp;     "rootnoverify": "root",
=             &nb= sp;     "kernel": "kernel",
&nbs= p;            &= nbsp;    "initrd": "initrd",
+ &= nbsp;           &nbs= p;   "module": "module",
            &nb= sp;     "chainloader": None,
-  =             &nb= sp;  "module": None}
+      = ;         }
   &n= bsp;    
 
 class GrubConfigFile(objec= t):
diff -uNrp a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub
--- a/tools/pygrub/src/pygrub    2009-02-20 09:59:40.0000000= 00 +0800
+++ b/tools/pygrub/src/pygrub    2009-02-20 10:1= 3:54.000000000 +0800
@@ -682,7 +682,7 @@ if __name__ =3D=3D "__main= __":
     if chosencfg["args"]:
         zfsinfo =3D fsimage.getboo= tstring(fs)
         if zfsinfo = is None:
-          &n= bsp; sxp +=3D "(args \"%s\")" % chosencfg["args&qu= ot;]
+           = sxp +=3D "(args \"%s %s\")" % (chosencfg["args&qu= ot;], incfg["args"])
         else:
   = ;          e =3D re.compile(&q= uot;zfs-bootfs=3D[\w\-\.\:@/]+" )
     &nb= sp;       (chosencfg["args"],count)= =3D e.subn(zfsinfo, chosencfg["args"])

--0015174c3c609aa4330463509277-- --===============0836713303== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --===============0836713303==--