[Pkg-libvirt-commits] [libguestfs] 42/63: v2v: When locating initramfs, ignore kdump initramfs images (RHBZ#1138184).

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag debian/1%1.27.39-1
in repository libguestfs.

commit 35d49cd9de8f07ae281b276bad852ad33875a9b8
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Fri Sep 5 14:13:28 2014 +0100

    v2v: When locating initramfs, ignore kdump initramfs images (RHBZ#1138184).
    
    Thanks: Tingting Zheng.
---
 v2v/convert_linux.ml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml
index 2c656cd..4ae64d8 100644
--- a/v2v/convert_linux.ml
+++ b/v2v/convert_linux.ml
@@ -181,6 +181,9 @@ let rec convert ~keep_serial_console verbose (g : G.guestfs)
                    string_find n app.G.app2_version >= 0 &&
                    string_find n app.G.app2_release >= 0
                ) files in
+             (* Don't consider kdump initramfs images (RHBZ#1138184). *)
+             let files =
+               List.filter (fun n -> string_find n "kdump.img" == -1) files in
              match files with
              | [] ->
                warning ~prog (f_"no initrd was found in /boot matching %s %s.")

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git