Oops sorry.


Signed-off-by: David Markey <david@dmarkey.com>
--- /a/usr/bin/pygrub   2010-03-04 12:32:36.000000000 +0000
+++ /b/usr/bin/pygrub   2010-03-05 08:16:57.000000000 +0000
@@ -383,7 +383,7 @@
                            ["/boot/grub/menu.lst", "/boot/grub/grub.conf",
                             "/grub/menu.lst", "/grub/grub.conf"]) + \
                        map(lambda x: (x,grub.GrubConf.Grub2ConfigFile),
-                           ["/boot/grub/grub.cfg"])
+                           ["/boot/grub/grub.cfg","/grub/grub.cfg"])

         if not fs:
             # set the config file and parse it



On 5 March 2010 08:49, Ian Campbell <Ian.Campbell@citrix.com> wrote:
On Fri, 2010-03-05 at 08:20 +0000, David Markey wrote:
> Pygrub doesn't detect the grub2 config file when it's on a
> separate /boot partition. This should fix it.

Thanks. You should include a Signed-off-by line.

Acked-by: Ian Campbell <ian.campbell@citrix.com>

Ian.

>
>
>
>
> --- /a/usr/bin/pygrub   2010-03-04 12:32:36.000000000 +0000
> +++ /b/usr/bin/pygrub   2010-03-05 08:16:57.000000000 +0000
> @@ -383,7 +383,7 @@
>                             ["/boot/grub/menu.lst",
> "/boot/grub/grub.conf",
>                              "/grub/menu.lst", "/grub/grub.conf"]) + \
>                         map(lambda x:
> (x,grub.GrubConf.Grub2ConfigFile),
> -                           ["/boot/grub/grub.cfg"])
> +                           ["/boot/grub/grub.cfg","/grub/grub.cfg"])
>
>
>          if not fs:
>              # set the config file and parse it
>
>