rpm/libguestfs
SHA256
1
0
Fork 0
forked from pool/libguestfs
Code Pull Requests Activity

Accepting request 404287 from home:cbosdonnat:branches:Virtualization

Browse Source 
* Fix p2v conditional build default
* Fix permissions of launch-virt-p2v
* Backport 82b74ed0bdb6d0cfd207343f75fa8e362c11d58e

OBS-URL: https://build.opensuse.org/request/show/404287
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=361
This commit is contained in:
Cédric Bosdonnat 2016-06-23 16:02:47 +00:00 committed by Git OBS Bridge
parent 86bfedb689
commit 61dd245dd1
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
0000-hotfix.patch
View File

@ -933,15 +933,16 @@ Index: libguestfs-1.32.4/v2v/convert_windows.ml
(* Get the Windows %systemroot%. *) (* Get the Windows %systemroot%. *)
let systemroot = g#inspect_get_windows_systemroot inspect.i_root in let systemroot = g#inspect_get_windows_systemroot inspect.i_root in
@@ -158,19 +165,19 @@ let convert ~keep_serial_console (g : G. @@ -158,19 +165,20 @@ let convert ~keep_serial_console (g : G.
(* Perform the conversion of the Windows guest. *) (* Perform the conversion of the Windows guest. *)
let rec configure_firstboot () = let rec configure_firstboot () =
- configure_rhev_apt (); - configure_rhev_apt ();
+ match installer with + (match installer with
+ | None -> () + | None -> ()
+ | Some (`RhevApt, tool_path) -> configure_rhev_apt tool_path + | Some (`RhevApt, tool_path) -> configure_rhev_apt tool_path
+ | Some (`VmdpExe, tool_path) -> configure_vmdp tool_path; + | Some (`VmdpExe, tool_path) -> configure_vmdp tool_path
+ );
unconfigure_xenpv () unconfigure_xenpv ()
- and configure_rhev_apt () = - and configure_rhev_apt () =
@ -960,7 +961,7 @@ Index: libguestfs-1.32.4/v2v/convert_windows.ml
@echo off @echo off
echo installing rhev-apt echo installing rhev-apt
@@ -179,8 +186,38 @@ echo installing rhev-apt @@ -179,8 +187,38 @@ echo installing rhev-apt
echo starting rhev-apt echo starting rhev-apt
net start rhev-apt net start rhev-apt
" in " in

3
libguestfs.spec
View File

@ -57,7 +57,7 @@ Release: 0
%bcond_with ruby_bindings %bcond_with ruby_bindings
%endif %endif
%bcond_with p2v %bcond_without p2v
%if %suse_version >= 1230 %if %suse_version >= 1230
%bcond_without bash_completion %bcond_without bash_completion
@ -803,6 +803,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root) %defattr(-,root,root)
%{_prefix}/lib/virt-p2v %{_prefix}/lib/virt-p2v
%{_datadir}/virt-p2v %{_datadir}/virt-p2v
%attr(0555,-,-) %{_datadir}/virt-p2v/launch-virt-p2v
%{_bindir}/virt-p2v-make-kiwi %{_bindir}/virt-p2v-make-kiwi
%{_bindir}/virt-p2v-make-disk %{_bindir}/virt-p2v-make-disk
%{_mandir}/man1/virt-p2v-make-kiwi* %{_mandir}/man1/virt-p2v-make-kiwi*