Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1788823 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com&gt; --- convert/convert_linux.ml | 54 +++++++++++++------- 1 file changed, 35 insertions(+), 19 deletions(-) diff --git a/convert/convert_linux.ml b/convert/convert_linux.ml index 116d9e06f792..930e555de8ed 100644 --- a/convert/convert_linux.ml +++ b/convert/convert_linux.ml @@ -64,7 +64,12 @@ let convert (g : G.guestfs) source inspect keep_serial_console _ = * this guest. See for example RHBZ#1965147. *) if inspect.i_apps = [] then - error (f_"inspection of the package database failed for this Linux guest. Rerun virt-v2v with -v -x and see earlier errors. This is an internal error which probably means that this guest is not supported by libguestfs inspection. If the guest should work with virt-v2v (see virt-v2v docs) then a fix will be required in libguestfs."); + error (f_"inspection of the package database failed for this Linux \ + guest. Rerun virt-v2v with -v -x and see earlier errors. \ + This is an internal error which probably means that this guest \ + is not supported by libguestfs inspection. If the guest should \ + work with virt-v2v (see virt-v2v docs) then a fix will be \ + required in libguestfs."); (* We use Augeas for inspection and conversion, so initialize it early. * Calling debug_augeas_errors will display any //error nodes in @@ -300,14 +305,16 @@ let convert (g : G.guestfs) source inspect keep_serial_console _ = Linux.augeas_reload g with G.Error msg -> - warning (f_"VirtualBox Guest Additions were detected, but uninstallation failed. The error message was: %s (ignored)") - msg + warning (f_"VirtualBox Guest Additions were detected, but \ + uninstallation failed. The error message was: %s \ + (ignored)") msg ) and unconfigure_vmware () = (* Look for any configured VMware yum repos and disable them. *) let repos = - g#aug_match "/files/etc/yum.repos.d/*/*[baseurl =~ regexp('https?://([^/]+\\.)?vmware\\.com/.*')]" in + g#aug_match "/files/etc/yum.repos.d/*/*[baseurl =~ \ + regexp('https?://([^/]+\\.)?vmware\\.com/.*')]" in let repos = Array.to_list repos in List.iter ( fun repo -> @@ -392,7 +399,8 @@ let convert (g : G.guestfs) source inspect keep_serial_console _ = ignore (g#command cmd); List.push_front library remove with G.Error msg -> - eprintf "%s: could not install replacement for %s. Error was: %s. %s was not removed.\n" + eprintf "%s: could not install replacement for %s. Error \ + was: %s. %s was not removed.\n" prog library msg library ); ) else ( @@ -438,8 +446,8 @@ let convert (g : G.guestfs) source inspect keep_serial_console _ = Linux.augeas_reload g with G.Error msg -> - warning (f_"VMware tools was detected, but uninstallation failed. The error message was: %s (ignored)") - msg + warning (f_"VMware tools was detected, but uninstallation failed. \ + The error message was: %s (ignored)") msg ) and unconfigure_citrix () = @@ -516,8 +524,8 @@ let convert (g : G.guestfs) source inspect keep_serial_console _ = Linux.augeas_reload g with G.Error msg -> - warning (f_"Parallels tools was detected, but uninstallation failed. The error message was: %s (ignored)") - msg + warning (f_"Parallels tools was detected, but uninstallation \ + failed. The error message was: %s (ignored)") msg ) and install_linux_tools () = @@ -539,7 +547,9 @@ let convert (g : G.guestfs) source inspect keep_serial_console _ = fun { ki_is_xen_pv_only_kernel = pv_only } -> pv_only ) bootloader_kernels in if only_xen_kernels then - error (f_"only Xen kernels are installed in this guest.\n\nRead the %s(1) manual, section \"Xen paravirtualized guests\", to see what to do.") prog; + error (f_"only Xen kernels are installed in this guest.\n\n\ + Read the %s(1) manual, section \"Xen paravirtualized \ + guests\", to see what to do.") prog; (* Enable the best non-Xen kernel, where "best" means the one with * the highest version, preferring non-debug kernels which support @@ -568,7 +578,8 @@ let convert (g : G.guestfs) source inspect keep_serial_console _ = print_kernel_info stderr "\t" best_kernel ); if best_kernel <> List.hd bootloader_kernels then ( - debug "best kernel is not the bootloader default, setting bootloader default ..."; + debug "best kernel is not the bootloader default, \ + setting bootloader default ..."; bootloader#set_default_kernel best_kernel.ki_vmlinuz ); @@ -664,8 +675,10 @@ let convert (g : G.guestfs) source inspect keep_serial_console _ = ) ) else if family = `Debian_family then ( - if not (g#is_file ~followsymlinks:true "/usr/sbin/update-initramfs") then - error (f_"unable to rebuild initrd (%s) because update-initramfs was not found in the guest") + if not (g#is_file ~followsymlinks:true + "/usr/sbin/update-initramfs") then + error (f_"unable to rebuild initrd (%s) because update-initramfs \ + was not found in the guest") initrd; if List.length modules > 0 then ( @@ -759,8 +772,8 @@ let convert (g : G.guestfs) source inspect keep_serial_console _ = ignore (g#sh cmd) ) else ( - error (f_"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in the guest") - initrd + error (f_"unable to rebuild initrd (%s) because mkinitrd or dracut \ + was not found in the guest") initrd ) (* We configure a console on ttyS0. Make sure existing console @@ -870,8 +883,9 @@ let convert (g : G.guestfs) source inspect keep_serial_console _ = if !updated && not (g#is_file ~followsymlinks:true "/usr/bin/X") && not (g#is_file ~followsymlinks:true "/usr/bin/X11/X") then - warning (f_"The display driver was updated to ‘%s’, but X11 does not seem to be installed in the guest. X may not function correctly.") - video_driver + warning (f_"The display driver was updated to ‘%s’, but X11 does not \ + seem to be installed in the guest. X may not function \ + correctly.") video_driver and configure_kernel_modules block_type net_type = (* This function modifies modules.conf (and its various aliases). *) @@ -909,7 +923,8 @@ let convert (g : G.guestfs) source inspect keep_serial_console _ = ] in try List.find (g#is_file ~followsymlinks:true) paths with Not_found -> - error (f_"unable to find any valid modprobe configuration file such as /etc/modprobe.conf"); + error (f_"unable to find any valid modprobe configuration file such \ + as /etc/modprobe.conf"); ) in @@ -1089,7 +1104,8 @@ let convert (g : G.guestfs) source inspect keep_serial_console _ = not (String.is_prefix device "sr") && not (String.is_prefix device "scd") && device <> "cdrom" then - warning (f_"%s references unknown device \"%s\". You may have to fix this entry manually after conversion.") + warning (f_"%s references unknown device \"%s\". You may have to \ + fix this entry manually after conversion.") path device; device in -- 2.19.1.3.g30247aa5d201

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1788823 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com&gt; --- convert/convert_linux.ml | 21 ++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/convert/convert_linux.ml b/convert/convert_linux.ml index 930e555de8ed..58a2a2a84d85 100644 --- a/convert/convert_linux.ml +++ b/convert/convert_linux.ml @@ -1231,10 +1231,12 @@ let convert (g : G.guestfs) source inspect keep_serial_console _ = g#mkdir_p uefi_fallback_path; g#cp uefi_grub_name uefi_fallback_name; g#cp grub_config uefi_grub_conf; - let fix_script = sprintf -"#!/bin/bash -efibootmgr -c -L \"CentOS 6\" -rm -rf %s" uefi_fallback_path in + let fix_script = + sprintf + "#!/bin/bash\n\ + efibootmgr -c -L \"CentOS 6\"\n\ + rm -rf %s" + uefi_fallback_path in Firstboot.add_firstboot_script g inspect.i_root "fix uefi boot" fix_script) else @@ -1262,10 +1264,13 @@ rm -rf %s" uefi_fallback_path in * at UEFI fallback path for simplicity *) if String.find shim "/boot/efi/EFI/ubuntu/shim" >= 0 then - let fix_script = sprintf -"#!/bin/bash -sudo efibootmgr -c -L ubuntu -l \\\\EFI\\\\ubuntu\\\\shim%s.efi -rm -rf %s" arch_suffix uefi_fallback_path in + let fix_script = + sprintf + "#!/bin/bash\n\ + sudo efibootmgr -c -L ubuntu \ + -l \\\\EFI\\\\ubuntu\\\\shim%s.efi\n\ + rm -rf %s" + arch_suffix uefi_fallback_path in Firstboot.add_firstboot_script g inspect.i_root "fix uefi boot" fix_script else -- 2.19.1.3.g30247aa5d201

On Tue, Mar 08, 2022 at 03:30:51PM +0100, Laszlo Ersek wrote: Well that's a lot easier to read :-) Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-builder quickly builds VMs from scratch http://libguestfs.org/virt-builder.1.html

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1788823 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com&gt; --- convert/convert_windows.ml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/convert/convert_windows.ml b/convert/convert_windows.ml index 97021766c2b7..f1ae0fa8a4b1 100644 --- a/convert/convert_windows.ml +++ b/convert/convert_windows.ml @@ -401,12 +401,14 @@ let convert (g : G.guestfs) _ inspect _ static_ips = let pnp_wait_path = "/Program Files/Guestfs/Firstboot/pnp_wait.exe" in - let fb_script = sprintf "\ -@echo off - -echo Wait for PnP to complete -\"%s\" >\"%%~dpn0.log\" 2>&1 -%s" (String.replace_char pnp_wait_path '/' '\\') reg_restore_str in + let fb_script = sprintf + "@echo off\n\ + \n\ + echo Wait for PnP to complete\n\ + \"%s\" >\"%%~dpn0.log\" 2>&1\n\ + %s" + (String.replace_char pnp_wait_path '/' '\\') + reg_restore_str in Firstboot.add_firstboot_script g inspect.i_root "wait pnp" fb_script; (* add_firstboot_script has created the path already. *) -- 2.19.1.3.g30247aa5d201

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1788823 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com&gt; --- convert/convert_windows.ml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/convert/convert_windows.ml b/convert/convert_windows.ml index 56e12cf12ba8..60742454c3c4 100644 --- a/convert/convert_windows.ml +++ b/convert/convert_windows.ml @@ -480,12 +480,12 @@ let convert (g : G.guestfs) _ inspect _ static_ips = match xenpv_uninst with | None -> () (* nothing to be uninstalled *) | Some uninst -> - let fb_script = sprintf "\ -@echo off - -echo uninstalling Xen PV driver -\"%s\" -" uninst in + let fb_script = sprintf + "@echo off\n\ + \n\ + echo uninstalling Xen PV driver\n\ + \"%s\"\n" + uninst in Firstboot.add_firstboot_script g inspect.i_root "uninstall Xen PV" fb_script -- 2.19.1.3.g30247aa5d201

While at it, embed the comment about ERROR_SUCCESS_REBOOT_REQUIRED being fine into the batch file. Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1788823 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com&gt; --- convert/convert_windows.ml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/convert/convert_windows.ml b/convert/convert_windows.ml index 0611bf06cb80..fa2eae28a768 100644 --- a/convert/convert_windows.ml +++ b/convert/convert_windows.ml @@ -512,15 +512,14 @@ let convert (g : G.guestfs) _ inspect _ static_ips = and unconfigure_vmwaretools () = List.iter ( fun uninst -> - let fb_script = "\ -@echo off - -echo uninstalling VMware Tools -" ^ uninst ^ -(* ERROR_SUCCESS_REBOOT_REQUIRED == 3010 is OK too *) -" -if errorlevel 3010 exit /b 0 -" in + let fb_script = sprintf + "@echo off\n\ + \n\ + echo uninstalling VMware Tools\n\ + rem ERROR_SUCCESS_REBOOT_REQUIRED (3010) is OK too\n\ + %s\n\ + if errorlevel 3010 exit /b 0\n" + uninst in Firstboot.add_firstboot_script g inspect.i_root "uninstall VMware Tools" fb_script -- 2.19.1.3.g30247aa5d201

On Tue, Mar 08, 2022 at 03:30:58PM +0100, Laszlo Ersek wrote: I had a double-take with the "too to" (but it is correct). Maybe s/too/also/ or s/too//? So this is a bit convoluted. I note you exposed default_prio in the Firstboot module which I was a little confused by, but now I see why you did it. However you didn't need to. You can instead do: ... ?prio has type 'int option'. So ACK with that change, and drop default_prio from Firstboot too. When pushing this patch, don't forget to update the common submodule in the same commit! 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

The windows converter installs the firstboot scripts in this order: do_convert configure_firstboot configure_wait_pnp add_firstboot_script configure_vmdp add_firstboot_script configure_qemu_ga add_firstboot_script unconfigure_xenpv add_firstboot_script unconfigure_prltools add_firstboot_script unconfigure_vmwaretools add_firstboot_script configure_network_interfaces install_firstboot_powershell "v2vnetcf.ps1" add_firstboot_script -> the script that polls for "netkvm.sys" with Get-NetAdapter, then calls New-NetIPAddress Because of this, if the guest is supposed to have static IP address(es), they are set by the "v2vnetcf.ps1" firstboot script quite late during first boot. It's more comfortable for users if the network is usable from an earlier point of the first boot, so register "v2vnetcf.ps1" in priority group 2500 (the default is 5000), moving the script to the front. Suggested-by: Richard W.M. Jones <rjones(a)redhat.com&gt; Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1788823 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com&gt; --- convert/convert_windows.ml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/convert/convert_windows.ml b/convert/convert_windows.ml index fa2eae28a768..b53312a9aba4 100644 --- a/convert/convert_windows.ml +++ b/convert/convert_windows.ml @@ -739,8 +739,12 @@ let convert (g : G.guestfs) _ inspect _ static_ips = add "" ) static_ips; - (* Install the Powershell script to run at firstboot. *) - Windows.install_firstboot_powershell g inspect psh_filename !psh + (* Install the Powershell script to run at firstboot. + * + * Place it first among the firstboot scripts (RHBZ#1788823). + *) + Windows.install_firstboot_powershell g inspect ~prio:2500 psh_filename + !psh ) (* static_ips <> [] *) and fix_ntfs_heads () = -- 2.19.1.3.g30247aa5d201

On 03/08/22 17:19, Richard W.M. Jones wrote: Merged the series as commit range 3a66d0fece08..5d24c1575750, with the following updates: 1: 570d94a81870 ! 1: bb952c113cf1 convert_linux: wrap overlong lines @@ -4,6 +4,8 @@ Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1788823 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com&gt; + Message-Id: <20220308143059.6384-2-lersek(a)redhat.com&gt; + Acked-by: Richard W.M. Jones <rjones(a)redhat.com&gt; diff --git a/convert/convert_linux.ml b/convert/convert_linux.ml --- a/convert/convert_linux.ml 2: fee83d7a0d6a ! 2: fb909fe761c4 convert_windows: wrap overlong lines @@ -4,6 +4,8 @@ Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1788823 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com&gt; + Message-Id: <20220308143059.6384-3-lersek(a)redhat.com&gt; + Acked-by: Richard W.M. Jones <rjones(a)redhat.com&gt; diff --git a/convert/convert_windows.ml b/convert/convert_windows.ml --- a/convert/convert_windows.ml 3: ee99a22b1b68 ! 3: e2995d10a5ee convert_linux: align shell script indentation with OCaml source code @@ -4,6 +4,8 @@ Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1788823 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com&gt; + Message-Id: <20220308143059.6384-4-lersek(a)redhat.com&gt; + Acked-by: Richard W.M. Jones <rjones(a)redhat.com&gt; diff --git a/convert/convert_linux.ml b/convert/convert_linux.ml --- a/convert/convert_linux.ml 4: 991624de3934 ! 4: 597d17756723 convert_windows: rewrite "configure_qemu_ga" script purely in PowerShell @@ -15,6 +15,8 @@ Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1788823 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com&gt; + Message-Id: <20220308143059.6384-5-lersek(a)redhat.com&gt; + Acked-by: Richard W.M. Jones <rjones(a)redhat.com&gt; diff --git a/convert/convert_windows.ml b/convert/convert_windows.ml --- a/convert/convert_windows.ml 5: 918d2cc869ea ! 5: 295b8ae74e33 convert_windows: align "reg_restore" batch file commands with OCaml source @@ -4,6 +4,8 @@ Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1788823 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com&gt; + Message-Id: <20220308143059.6384-6-lersek(a)redhat.com&gt; + Acked-by: Richard W.M. Jones <rjones(a)redhat.com&gt; diff --git a/convert/convert_windows.ml b/convert/convert_windows.ml --- a/convert/convert_windows.ml 6: 0f216c4351e3 ! 6: 423a009280b6 convert_windows: align "configure_wait_pnp" batch file with OCaml source @@ -4,6 +4,8 @@ Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1788823 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com&gt; + Message-Id: <20220308143059.6384-7-lersek(a)redhat.com&gt; + Acked-by: Richard W.M. Jones <rjones(a)redhat.com&gt; diff --git a/convert/convert_windows.ml b/convert/convert_windows.ml --- a/convert/convert_windows.ml 7: 74e1089a3774 ! 7: 1a63125af21d convert_windows: align "configure_vmdp" batch files with OCaml source @@ -4,6 +4,8 @@ Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1788823 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com&gt; + Message-Id: <20220308143059.6384-8-lersek(a)redhat.com&gt; + Acked-by: Richard W.M. Jones <rjones(a)redhat.com&gt; diff --git a/convert/convert_windows.ml b/convert/convert_windows.ml --- a/convert/convert_windows.ml 8: ad69b2cc19c5 ! 8: 4e4959037294 convert_windows: align "unconfigure_xenpv" batch file with OCaml source @@ -4,6 +4,8 @@ Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1788823 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com&gt; + Message-Id: <20220308143059.6384-9-lersek(a)redhat.com&gt; + Acked-by: Richard W.M. Jones <rjones(a)redhat.com&gt; diff --git a/convert/convert_windows.ml b/convert/convert_windows.ml --- a/convert/convert_windows.ml 9: 7b0004c90c6d ! 9: e3814222190c convert_windows: align "unconfigure_prltools" batch file with OCaml source @@ -7,6 +7,8 @@ Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1788823 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com&gt; + Message-Id: <20220308143059.6384-10-lersek(a)redhat.com&gt; + Acked-by: Richard W.M. Jones <rjones(a)redhat.com&gt; diff --git a/convert/convert_windows.ml b/convert/convert_windows.ml --- a/convert/convert_windows.ml 10: b2bdea6dcfab ! 10: 12648416c15d convert_windows: align "unconfigure_vmwaretools" batch file with OCaml src @@ -7,6 +7,8 @@ Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1788823 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com&gt; + Message-Id: <20220308143059.6384-11-lersek(a)redhat.com&gt; + Acked-by: Richard W.M. Jones <rjones(a)redhat.com&gt; diff --git a/convert/convert_windows.ml b/convert/convert_windows.ml --- a/convert/convert_windows.ml 11: 981546f9f33c ! 11: 54b74413e86d convert/windows: expose "prio" parameter in install_firstboot_powershell @@ -4,11 +4,16 @@ The "Firstboot.add_firstboot_script" function now takes an (optional) priority parameter. Because "install_firstboot_powershell" is a wrapper - around "Firstboot.add_firstboot_script", enable callers of the former too - to set the script run priority. + around "Firstboot.add_firstboot_script", enable callers of the former to + set the script run priority. Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1788823 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com&gt; + Message-Id: <20220308143059.6384-12-lersek(a)redhat.com&gt; + [lersek(a)redhat.com: improve commit message language (Rich)] + [lersek(a)redhat.com: include hunk for submodule update (Rich)] + [lersek(a)redhat.com: forward optional parameter idiomatically (Rich)] + Acked-by: Richard W.M. Jones <rjones(a)redhat.com&gt; diff --git a/convert/windows.mli b/convert/windows.mli --- a/convert/windows.mli @@ -33,8 +38,7 @@ *) let install_firstboot_powershell g { Types.i_windows_systemroot; i_root } - filename code = -+ ?(prio = Firstboot.default_prio) filename -+ code = ++ ?prio filename code = let tempdir = sprintf "%s/Temp" i_windows_systemroot in g#mkdir_p tempdir; let code = String.concat "\r\n" code ^ "\r\n" in @@ -43,4 +47,11 @@ let fb = sprintf "%s -ExecutionPolicy ByPass -file %s" ps_exe ps_path in - Firstboot.add_firstboot_script g i_root filename fb -+ Firstboot.add_firstboot_script g i_root ~prio filename fb ++ Firstboot.add_firstboot_script g i_root ?prio filename fb + +diff --git a/common b/common +--- a/common ++++ b/common +@@ +-Subproject commit 60efc5407552c12688a5e99b7a54d23d5990aa8f ++Subproject commit ab708d11d832457d2a0c74e7a6d8c219a4fdd90f 12: 6117bd7cfc15 ! 12: 5d24c1575750 convert_windows: install "v2vnetcf.ps1" with prio 2500 @@ -35,6 +35,8 @@ Suggested-by: Richard W.M. Jones <rjones(a)redhat.com&gt; Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1788823 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com&gt; + Message-Id: <20220308143059.6384-13-lersek(a)redhat.com&gt; + Acked-by: Richard W.M. Jones <rjones(a)redhat.com&gt; diff --git a/convert/convert_windows.ml b/convert/convert_windows.ml --- a/convert/convert_windows.ml Thanks Laszlo