SUSE Linux Entreprise Server doesn't have dhcpcd and the hivex package is not in the default repositories. Better use dhcp-client and libhivex0 --- appliance/packagelist.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appliance/packagelist.in b/appliance/packagelist.in index daf589e..c221854 100644 --- a/appliance/packagelist.in +++ b/appliance/packagelist.in @@ -132,11 +132,11 @@ ifelse(SUSE,1, augeas-lenses btrfsprogs cryptsetup - dhcpcd + dhcp-client genisoimage glibc-locale gptfdisk - hivex + libhivex0 iproute2 iputils libcap2 -- 2.6.6

On Thursday 12 May 2016 15:29:10 Cédric Bosdonnat wrote: It seems like openSUSE 13.2 has libhivex0 as well, so this change LGTM. Thanks, -- Pino Toscano

On Thu, May 12, 2016 at 03:29:11PM +0200, Cédric Bosdonnat wrote: How will you debug failures then? (And yes, linux firstboot is broken in this regard, too)

On Fri, May 13, 2016 at 09:17:40AM +0200, Cedric Bosdonnat wrote: IMO deleting anything is a bad idea, in particular, because a succefully completed script may cause the following ones to fail. The whole point of scripts_done is to preserve all the steps but move them out of the way. I think the only controversial item is whether to move them to scripts_done on success only or regardless of the status: there are pros and cons either way. Roman.

On Thu, May 12, 2016 at 03:29:12PM +0200, Cédric Bosdonnat wrote: This patch breaks the virt-v2v tests. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com Fedora Windows cross-compiler. Compile Windows programs, test, and build Windows installers. Over 100 libraries supported. http://fedoraproject.org/wiki/MinGW

To add this support, two things are needed: * make the existing code searches for either the viostor or the SUSE VMDP (Virtual Machine Driver Pack) files. * add a firstboot script setting up VMDP. Note that 2 firstboot scripts are intentionally added for the VMDP setup. This is due to windows potentially rebooting after loading the virtio block driver. It may happen that this reboot interrupts the VMDP setup in the firstboot script, we thus make sure the setup is run a second time in case it needs to finish the previous run. --- v2v/convert_windows.ml | 73 +++++++++++++++++++++++++++++++++++++++++--------- v2v/windows_virtio.ml | 25 ++++++++++++----- 2 files changed, 78 insertions(+), 20 deletions(-) diff --git a/v2v/convert_windows.ml b/v2v/convert_windows.ml index 5daae6c..ab28636 100644 --- a/v2v/convert_windows.ml +++ b/v2v/convert_windows.ml @@ -43,18 +43,25 @@ let convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = try Sys.getenv "VIRT_TOOLS_DATA_DIR" with Not_found -> Guestfs_config.datadir // "virt-tools" in - (* Check if RHEV-APT exists. This is optional. *) - let rhev_apt_exe = virt_tools_data_dir // "rhev-apt.exe" in - let rhev_apt_exe = + (* Check if either RHEV-APT or VMDP exists. This is optional. *) + let tools = ["rhev-apt.exe"; "vmdp.exe"] in + let installer = try - let chan = open_in rhev_apt_exe in - close_in chan; - Some rhev_apt_exe - with - Sys_error msg -> - warning (f_"'%s' is missing. Unable to install RHEV-APT (RHEV guest agent). Original error: %s") - rhev_apt_exe msg; - None in + let tool = List.find ( + fun item -> + try ( + let exe_path = virt_tools_data_dir // item in + let chan = open_in exe_path in + close_in chan; + true + ) with _ -> + false + ) tools in + Some (virt_tools_data_dir // tool) + with Not_found -> ( + warning (f_"Neither rhev-apt.exe nor vmdp.exe can be found. Unable to install one of them."); + None + ) in (* Get the Windows %systemroot%. *) let systemroot = g#inspect_get_windows_systemroot inspect.i_root in @@ -211,7 +218,14 @@ let convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = (* Perform the conversion of the Windows guest. *) let rec configure_firstboot () = - configure_rhev_apt (); + match installer with + | None -> info (f_"No firstboot installer to configure") + | Some installer_path -> + let installer_name = Filename.basename installer_path in + match installer_name with + | "rhev-apt.exe" -> configure_rhev_apt () + | "vmdp.exe" -> configure_vmdp () + | _ -> info (f_"No setup function for installer '%s'") installer_path; unconfigure_xenpv (); unconfigure_prltools () @@ -219,7 +233,7 @@ let convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = (* Configure RHEV-APT (the RHEV guest agent). However if it doesn't * exist just warn about it and continue. *) - match rhev_apt_exe with + match installer with | None -> () | Some rhev_apt_exe -> g#upload rhev_apt_exe "/rhev-apt.exe"; (* XXX *) @@ -236,6 +250,39 @@ net start rhev-apt Firstboot.add_firstboot_script g inspect.i_root "configure rhev-apt" fb_script + and configure_vmdp () = + (* Configure VMDP if possible *) + match installer with + | None -> () + | Some vmdp_exe -> + g#upload vmdp_exe "/vmdp.exe"; + + let fb_script = "\ +echo V2V first boot script started +echo Decompressing VMDP installer +\"\\vmdp.exe\" +pushd \"VMDP-*\" +echo Installing VMDP +setup.exe /eula_accepted /no_reboot +popd +" in + + let fb_recover_script = "\ +echo Finishing VMDP installation +if not exist VMDP-* ( + \"\\vmdp.exe\" +) +pushd \"VMDP-*\" +setup.exe /eula_accepted /no_reboot +popd +" in + + Firstboot.add_firstboot_script g inspect.i_root + "configure vmdp" fb_script; + + Firstboot.add_firstboot_script g inspect.i_root + "finish vmdp setup" fb_recover_script + and unconfigure_xenpv () = match xenpv_uninst with | None -> () (* nothing to be uninstalled *) diff --git a/v2v/windows_virtio.ml b/v2v/windows_virtio.ml index 7e9f735..a878a3e 100644 --- a/v2v/windows_virtio.ml +++ b/v2v/windows_virtio.ml @@ -66,11 +66,19 @@ let rec install_drivers g inspect systemroot root current_cs rcaps = else ( (* Can we install the block driver? *) let block : guestcaps_block_type = - let has_viostor = g#exists (driverdir // "viostor.inf") in + let filenames = ["virtio_blk"; "vrtioblk"; "viostor"] in + let driver_name = try ( + List.find ( + fun driver_file -> + let source = driverdir // (driver_file ^ ".sys") in + g#exists source + ) filenames + ) with Not_found -> "" in + let has_viostor = not (driver_name = "") in let has_vioscsi = g#exists (driverdir // "vioscsi.inf") in match rcaps.rcaps_block_bus, has_viostor, has_vioscsi with | Some Virtio_blk, false, _ -> - error (f_"there is no viostor (virtio block device) driver for this version of Windows (%d.%d %s). virt-v2v looks for this driver in %s\n\nThe guest will be configured to use a slower emulated device.") + error (f_"there is no virtio block device driver for this version of Windows (%d.%d %s). virt-v2v looks for this driver in %s\n\nThe guest will be configured to use a slower emulated device.") inspect.i_major_version inspect.i_minor_version inspect.i_arch virtio_win @@ -79,8 +87,9 @@ let rec install_drivers g inspect systemroot root current_cs rcaps = inspect.i_major_version inspect.i_minor_version inspect.i_arch virtio_win + | None, false, _ -> - warning (f_"there is no viostor (virtio block device) driver for this version of Windows (%d.%d %s). virt-v2v looks for this driver in %s\n\nThe guest will be configured to use a slower emulated device.") + warning (f_"there is no virtio block device driver for this version of Windows (%d.%d %s). virt-v2v looks for this driver in %s\n\nThe guest will be configured to use a slower emulated device.") inspect.i_major_version inspect.i_minor_version inspect.i_arch virtio_win; IDE @@ -88,11 +97,12 @@ let rec install_drivers g inspect systemroot root current_cs rcaps = | (Some Virtio_blk | None), true, _ -> (* Block driver needs tweaks to allow booting; the rest is set up by PnP * manager *) - let source = driverdir // "viostor.sys" in - let target = sprintf "%s/system32/drivers/viostor.sys" systemroot in + let source = driverdir // (driver_name ^ ".sys") in + let targetdir = systemroot ^ "/system32/drivers/" in + let target = targetdir // (driver_name ^ ".sys") in let target = g#case_sensitive_path target in g#cp source target; - add_guestor_to_registry g root current_cs "viostor" + add_guestor_to_registry g root current_cs driver_name viostor_pciid; Virtio_blk @@ -112,7 +122,8 @@ let rec install_drivers g inspect systemroot root current_cs rcaps = (* Can we install the virtio-net driver? *) let net : guestcaps_net_type = - let has_netkvm = g#exists (driverdir // "netkvm.inf") in + let filenames = ["virtio_net.inf"; "netkvm.inf"] in + let has_netkvm = List.exists (fun driver_file -> g#exists (driverdir // driver_file)) filenames in match rcaps.rcaps_net_bus, has_netkvm with | Some Virtio_net, false -> error (f_"there is no virtio network driver for this version of Windows (%d.%d %s). virt-v2v looks for this driver in %s") -- 2.6.6

On Thu, May 12, 2016 at 03:29:15PM +0200, Cédric Bosdonnat wrote: Have you been able to identify the reason of this reboot? Isn't it triggered by the PnP manager? I guess it is, and, since we copy over the drivers with all the stuff to properly install them, the PnP manager will do so completely unsynchronized to our firstboot activity, so all scripts are in danger. I think this should better be resolved generically, by not running the scripts until PnP completes (that includes reboots). So you have somehow managed to decouple virtio_blk from the balloon driver, haven't you? Roman.

On Thursday 12 May 2016 15:29:15 Cédric Bosdonnat wrote: Instead of using an empty string for driver_name, use an OCaml option: let driver_name = try ( Some ( List.find ( ... ) ) ) with Not_found -> None in let has_viostor = is_some driver_name in It is slightly longer, but IMHO clearer to read. -- Pino Toscano

Running the init on openSUSE and SLE machines showed up minor errors: * skip the /etc/mtab symlink creation if the file is already existing. * make sure /run/lvm is created or lvmetab will complain. --- appliance/init | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/appliance/init b/appliance/init index 413a95f..b22032e 100755 --- a/appliance/init +++ b/appliance/init @@ -70,7 +70,9 @@ ln -s ../run/lock /var/lock # On Fedora 23, util-linux creates /etc/mtab in %post .. stupid # and e2fsprogs fails if the link doesn't exist .. stupid stupid -ln -s /proc/mounts /etc/mtab +if ! test -e /etc/mtab; then + ln -s /proc/mounts /etc/mtab +fi # devtmpfs is required since udev 176 mount -t devtmpfs /dev /dev @@ -132,6 +134,7 @@ mdadm -As --auto=yes --run # Scan for LVM. modprobe dm_mod ||: +mkdir -p /run/lvm lvmetad ||: lvm vgchange -aay --sysinit -- 2.6.6

In virt-v2v man page the documentation on how to use RHEL 5 Xen as input is generic enough to fit other Xen versions. --- v2v/virt-v2v.pod | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod index 293efeb..292c5a3 100644 --- a/v2v/virt-v2v.pod +++ b/v2v/virt-v2v.pod @@ -338,7 +338,7 @@ Xen remote connections can be used. Other remote libvirt connections will not work in general. See also L</INPUT FROM VMWARE VCENTER SERVER>, -L</INPUT FROM RHEL 5 XEN> below. +L</INPUT FROM XEN> below. =item B<-if> format @@ -1228,9 +1228,10 @@ Perform the conversion of the guest using virt-v2v: Remove the F<guest.xml> and F<guest-disk*> files. -=head1 INPUT FROM RHEL 5 XEN +=head1 INPUT FROM XEN -Virt-v2v is able to import Xen guests from RHEL 5 Xen hosts. +Virt-v2v is able to import Xen guests from RHEL 5 Xen or SLES and +openSUSE Xen hosts. Virt-v2v uses libvirt for access to the remote Xen host, and therefore the input mode should be I<-i libvirt>. As this is the default, you -- 2.6.6

On Thu, May 12, 2016 at 03:29:19PM +0200, Cédric Bosdonnat wrote: Too many parentheses here. Function application always has the highest precedence in functional languages. Also you can nest variables to make them private. Thus this becomes: let version = let prefix_len = String.length "/lib/modules/" in String.sub modpath prefix_len (String.length modpath - prefix_len) in - - - The patches that I _didn't_ comment on all look OK to me. I'd like to see the whole series posted again with everything fixed though. Thanks, Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com libguestfs lets you edit virtual machines. Supports shell scripting, bindings from many languages. http://libguestfs.org