[Libguestfs] [PATCH v2 7/7] v2v: linux: adapt initrd name for Debian

[Richard W.M. Jones]

On Fri, Aug 26, 2016 at 11:02:09AM +0200, Pino Toscano wrote:
> The name of the initrd image on Debian-based systems is different from
> what used on Fedora/RHEL/SUSE and derived; set a different regexp to
> avoid making the current regexp even more complex.
> ---
>  v2v/convert_linux.ml | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml
> index 464ad49..9585a23 100644
> --- a/v2v/convert_linux.ml
> +++ b/v2v/convert_linux.ml
> @@ -111,7 +111,11 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source rcaps =
>          )
>      in
>      let rex_ko_extract = Str.regexp ".*/\\([^/]+\\)\\.k?o\\(\\.xz\\)?$" in
> -    let rex_initrd = Str.regexp "^initr\\(d\\|amfs\\)-.*\\(\\.img\\)?$" in
> +    let rex_initrd =
> +      if family = `Debian_family then
> +        Str.regexp "^initrd.img-.*$"
> +      else
> +        Str.regexp "^initr\\(d\\|amfs\\)-.*\\(\\.img\\)?$" in
>      filter_map (
>        function
>        | { G.app2_name = name } as app
> -- 

ACK.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-df lists disk usage of guests without needing to install any
software inside the virtual machine.  Supports Linux and Windows.
http://people.redhat.com/~rjones/virt-df/