Accepting request 494929 from home:cbosdonnat:branches:Virtualization

OBS-URL: https://build.opensuse.org/request/show/494929
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=388

0000-hotfix.patch

@@ -828,6 +828,16 @@ Index: libguestfs-1.32.4/v2v/convert_linux.ml
                 (* If several files match, take the shortest match.  This
                  * handles the case where we have a mix of same-version non-Xen
                  * and Xen kernels:
+@@ -844,7 +844,8 @@ let rec convert ~keep_serial_console (g
+           g#command [| "/sbin/mkinitrd";
+                        "-m"; String.concat " " modules;
+                        "-i"; initrd;
+-                       "-k"; kernel.ki_vmlinuz |]
++                       "-k"; kernel.ki_vmlinuz;
++                       "-d"; inspect.i_root |]
+         )
+       )
+       else if g#is_file ~followsymlinks:true "/sbin/mkinitrd" then (
 Index: libguestfs-1.32.4/v2v/test-v2v-in-place.sh
 ===================================================================
 --- libguestfs-1.32.4.orig/v2v/test-v2v-in-place.sh

libguestfs.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon May 15 12:13:40 UTC 2017 - cbosdonnat@suse.com
+
+- Don't let mkinitrd guess the root device (bsc#1038397)
+
 -------------------------------------------------------------------
 Thu Apr  6 13:27:25 UTC 2017 - cbosdonnat@suse.com