pool/libguestfs
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 500560 from home:cbosdonnat:branches:Virtualization

Browse Source 
- Fix v2v conversion of SLES 11 SP4 with kdump enabled
  bsc#1038397

OBS-URL: https://build.opensuse.org/request/show/500560
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=393
This commit is contained in:
Cédric Bosdonnat 2017-06-02 09:02:21 +00:00 committed by Git OBS Bridge
parent 1351a7f576
commit 4ba8479520
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
0000-hotfix.patch
View File

@ -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;

6
libguestfs.changes
View File

@ -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 Tue May 30 09:42:47 UTC 2017 - ohering@suse.de

4
libguestfs.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libguestfs # 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 <mhrusecky@novell.com> # Copyright (c) 2011 Michal Hrusecky <mhrusecky@novell.com>
# #
# All modifications and additions to the file contributed by third parties # 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} %if %{with ocaml_bindings}
%package -n ocaml-libguestfs %package -n ocaml-libguestfs
Summary: Provides OCaml support for libguestfs Summary: Provides OCaml support for libguestfs
#
License: GPL-2.0 License: GPL-2.0
Group: System/Filesystems Group: System/Filesystems
#
%description -n ocaml-libguestfs %description -n ocaml-libguestfs
Allows OCaml scripts to directly use libguestfs. Allows OCaml scripts to directly use libguestfs.