diff --git a/0000-hotfix.patch b/0000-hotfix.patch index 473a0f4..4a9294a 100644 --- a/0000-hotfix.patch +++ b/0000-hotfix.patch @@ -0,0 +1,15 @@ +Index: libguestfs-1.36.4/v2v/convert_linux.ml +=================================================================== +--- libguestfs-1.36.4.orig/v2v/convert_linux.ml ++++ libguestfs-1.36.4/v2v/convert_linux.ml +@@ -514,7 +514,9 @@ let rec convert (g : G.guestfs) inspect + else if family = `SUSE_family + && g#is_file ~followsymlinks:true "/sbin/mkinitrd" then ( + ignore ( +- g#command [| "/sbin/mkinitrd"; ++ g#command [| "/usr/bin/env"; ++ "rootdev=" ^ inspect.i_root; ++ "/sbin/mkinitrd"; + "-m"; String.concat " " modules; + "-i"; initrd; + "-k"; kernel.ki_vmlinuz; diff --git a/libguestfs.changes b/libguestfs.changes index 83aafc9..f0f0134 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jun 1 16:12:07 UTC 2017 - cbosdonnat@suse.com + +- Fix v2v conversion of SLES 11 SP4 with kdump enabled + bsc#1038397 + ------------------------------------------------------------------- Tue May 30 09:42:47 UTC 2017 - ohering@suse.de diff --git a/libguestfs.spec b/libguestfs.spec index 5c893ab..e4e47d3 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -1,7 +1,7 @@ # # spec file for package libguestfs # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011 Michal Hrusecky # # All modifications and additions to the file contributed by third parties @@ -244,9 +244,9 @@ This package is only required for building the appliance. %if %{with ocaml_bindings} %package -n ocaml-libguestfs Summary: Provides OCaml support for libguestfs -# License: GPL-2.0 Group: System/Filesystems +# %description -n ocaml-libguestfs Allows OCaml scripts to directly use libguestfs.