Libguestfs - Mar 2017 - [PATCH 2/2] v2v: bootloaders: look for device.map also in /boot/grub (Grub2)

On Debian-based systems, Grub2 is in /boot/grub (as already known after
commit 03b9f2b967c4c61a5acda6a3802317be109d213e), so make sure
device.map is changed even in this situation.
---
 v2v/linux_bootloaders.ml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/v2v/linux_bootloaders.ml b/v2v/linux_bootloaders.ml
index 6582970..061d945 100644
--- a/v2v/linux_bootloaders.ml
+++ b/v2v/linux_bootloaders.ml
@@ -266,6 +266,7 @@ object (self)
     "/files/etc/default/grub/GRUB_CMDLINE_LINUX";
     "/files/etc/default/grub/GRUB_CMDLINE_LINUX_DEFAULT";
     "/files/boot/grub2/device.map/*[label() !=
\"#comment\"]";
+    "/files/boot/grub/device.map/*[label() !=
\"#comment\"]";
   ]
 
   method list_kernels -- 
2.9.3

On Tue, Mar 14, 2017 at 03:17:35PM +0100, Pino Toscano
wrote:
> On Debian-based systems, Grub2 is in /boot/grub (as already known after
> commit 03b9f2b967c4c61a5acda6a3802317be109d213e), so make sure
> device.map is changed even in this situation.
> ---
>  v2v/linux_bootloaders.ml | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/v2v/linux_bootloaders.ml b/v2v/linux_bootloaders.ml
> index 6582970..061d945 100644
> --- a/v2v/linux_bootloaders.ml
> +++ b/v2v/linux_bootloaders.ml
> @@ -266,6 +266,7 @@ object (self)
>      "/files/etc/default/grub/GRUB_CMDLINE_LINUX";
>      "/files/etc/default/grub/GRUB_CMDLINE_LINUX_DEFAULT";
>      "/files/boot/grub2/device.map/*[label() !=
\"#comment\"]";
> +    "/files/boot/grub/device.map/*[label() !=
\"#comment\"]";
>    ]
>  
>    method list_kernels 
ACK both patches.

Thanks,

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-builder quickly builds VMs from scratch
http://libguestfs.org/virt-builder.1.html