Accepting request 404287 from home:cbosdonnat:branches:Virtualization

* 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

0000-hotfix.patch

@@ -933,15 +933,16 @@ Index: libguestfs-1.32.4/v2v/convert_windows.ml
  
    (* Get the Windows %systemroot%. *)
    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. *)
  
    let rec configure_firstboot () =
 -    configure_rhev_apt ();
-+    match installer with
-+    | None -> ()
-+    | Some (`RhevApt, tool_path) -> configure_rhev_apt tool_path
-+    | Some (`VmdpExe, tool_path) -> configure_vmdp tool_path;
++    (match installer with
++     | None -> ()
++     | Some (`RhevApt, tool_path) -> configure_rhev_apt tool_path
++     | Some (`VmdpExe, tool_path) -> configure_vmdp tool_path
++    );
      unconfigure_xenpv ()
  
 -  and configure_rhev_apt () =
@@ -960,7 +961,7 @@ Index: libguestfs-1.32.4/v2v/convert_windows.ml
  @echo off
  
  echo installing rhev-apt
-@@ -179,8 +186,38 @@ echo installing rhev-apt
+@@ -179,8 +187,38 @@ echo installing rhev-apt
  echo starting rhev-apt
  net start rhev-apt
  " in

libguestfs.spec

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