From f07dd7cea74fb0a98a9ec1a4ae897b91fdc4d37e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 12 Aug 2024 13:33:34 +0100 Subject: [PATCH] Further fixes for QEMU Guest Agent install & VMware Tools removal resolves: RHEL-50563 --- ...e-that-mac-len-field-is-now-optional.patch | 28 +++ ...ust-qemu-ga-installation-change-path.patch | 207 ++++++++++++++++++ ...ze-Inject-qemu-ga-blnsvr-into-firstb.patch | 116 ++++++++++ ...about-removal-of-VMware-Tools-on-Win.patch | 45 ++++ 0005-Update-common-submodule.patch | 25 +++ ...-make-Windows-firstboot-more-reliabl.patch | 78 +++++++ ...-position-on-removal-of-VMware-Tools.patch | 30 +++ ...correct-qemu-binary-for-o-qemu-mode-.patch | 2 +- ...-the-qemu-boot-oo-qemu-boot-option-R.patch | 8 +- ...-supported-sound-cards-to-match-RHEL.patch | 2 +- ...RHEL-Fixes-for-libguestfs-winsupport.patch | 4 +- ...sk-force-VNC-as-display-RHBZ-1372671.patch | 4 +- ...-for-supported-v2v-hypervisors-guest.patch | 2 +- ...h => 0014-RHEL-Remove-input-from-Xen.patch | 14 +- ...re-dot-underscore-files-in-OVA-files.patch | 43 ---- ...e.patch => 0015-RHEL-Remove-o-glance.patch | 18 +- 0015-Update-common-submodule.patch | 109 --------- ...0016-RHEL-Remove-the-in-place-option.patch | 12 +- ...=> 0017-RHEL-tests-Remove-btrfs-test.patch | 2 +- ...0018-RHEL-Remove-block-driver-option.patch | 20 +- ...-o-rhv-o-rhv-upload-and-o-vdsm-modes.patch | 40 ++-- ...-about-virt-v2v-in-place-not-being-s.patch | 8 +- sources | 4 +- virt-v2v.spec | 43 ++-- 24 files changed, 625 insertions(+), 239 deletions(-) create mode 100644 0001-docs-Note-that-mac-len-field-is-now-optional.patch create mode 100644 0002-convert-More-robust-qemu-ga-installation-change-path.patch create mode 100644 0003-common-mlcustomize-Inject-qemu-ga-blnsvr-into-firstb.patch create mode 100644 0004-docs-Add-a-note-about-removal-of-VMware-Tools-on-Win.patch create mode 100644 0005-Update-common-submodule.patch create mode 100644 0006-Pull-in-a-fix-to-make-Windows-firstboot-more-reliabl.patch create mode 100644 0007-docs-Restate-position-on-removal-of-VMware-Tools.patch rename 0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch => 0008-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch (94%) rename 0002-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch => 0009-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch (95%) rename 0003-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch => 0010-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch (92%) rename 0004-RHEL-Fixes-for-libguestfs-winsupport.patch => 0011-RHEL-Fixes-for-libguestfs-winsupport.patch (97%) rename 0005-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch => 0012-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch (89%) rename 0006-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch => 0013-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch (97%) rename 0007-RHEL-Remove-input-from-Xen.patch => 0014-RHEL-Remove-input-from-Xen.patch (98%) delete mode 100644 0014-i-ova-Ignore-dot-underscore-files-in-OVA-files.patch rename 0008-RHEL-Remove-o-glance.patch => 0015-RHEL-Remove-o-glance.patch (94%) delete mode 100644 0015-Update-common-submodule.patch rename 0009-RHEL-Remove-the-in-place-option.patch => 0016-RHEL-Remove-the-in-place-option.patch (91%) rename 0010-RHEL-tests-Remove-btrfs-test.patch => 0017-RHEL-tests-Remove-btrfs-test.patch (91%) rename 0011-RHEL-Remove-block-driver-option.patch => 0018-RHEL-Remove-block-driver-option.patch (91%) rename 0012-RHEL-Remove-o-rhv-o-rhv-upload-and-o-vdsm-modes.patch => 0019-RHEL-Remove-o-rhv-o-rhv-upload-and-o-vdsm-modes.patch (99%) rename 0013-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch => 0020-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch (81%) diff --git a/0001-docs-Note-that-mac-len-field-is-now-optional.patch b/0001-docs-Note-that-mac-len-field-is-now-optional.patch new file mode 100644 index 0000000..4c74f1d --- /dev/null +++ b/0001-docs-Note-that-mac-len-field-is-now-optional.patch @@ -0,0 +1,28 @@ +From 7800049c5612e6ffb30be7f8862d147d82976ae8 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Wed, 31 Jul 2024 10:09:50 +0100 +Subject: [PATCH] docs: Note that --mac len field is now optional + +Reported-by: Ming Xie +Updates: commit 159fda411d2f75b087106e7293d273ae142c9fbe +--- + docs/virt-v2v.pod | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod +index b53face6..dfe92d77 100644 +--- a/docs/virt-v2v.pod ++++ b/docs/virt-v2v.pod +@@ -394,9 +394,9 @@ Force a particular interface (controlled by its MAC address) to have a + static IP address after boot. + + The fields in the parameter are: C is the IP address. C +-is the optional gateway IP address. C is the subnet mask length +-(an integer). The final parameters are zero or more nameserver IP +-addresses. ++is the optional gateway IP address. C is the optional subnet ++mask length (an integer). The final parameters are zero or more ++nameserver IP addresses. + + This option can be supplied zero or more times. + diff --git a/0002-convert-More-robust-qemu-ga-installation-change-path.patch b/0002-convert-More-robust-qemu-ga-installation-change-path.patch new file mode 100644 index 0000000..1bf5676 --- /dev/null +++ b/0002-convert-More-robust-qemu-ga-installation-change-path.patch @@ -0,0 +1,207 @@ +From c57ec4fd5d4942d2320aec4a6b01977dabb87f83 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Thu, 1 Aug 2024 09:01:47 +0100 +Subject: [PATCH] convert: More robust qemu-ga installation, change paths + +Add a commit from the common submodule to attempt to make qemu-ga +installation more robust on Windows. + +Rename network configuration Powershell script from "v2vnetcf" to +"network-configuration". I also dropped the ".ps1" extension as the +modified Firstboot.add_firstboot_powershell function now adds this. + +Update the common submodule to get these changes: + +Richard W.M. Jones (3): + mlcustomize: Use Start-Process -Wait to run qemu-ga installer + mlcustomize: Add Firstboot.firstboot_dir function + mlcustomize: Place powershell scripts into \Temp +--- + common | 2 +- + convert/convert_windows.ml | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +Submodule common ae639ba3..d489469f: +diff --git a/common/mlcustomize/firstboot.ml b/common/mlcustomize/firstboot.ml +index 4b9b910b..3bbba714 100644 +--- a/common/mlcustomize/firstboot.ml ++++ b/common/mlcustomize/firstboot.ml +@@ -239,7 +239,22 @@ WantedBy=%s + end + + module Windows = struct +- let rec install_service (g : Guestfs.guestfs) root = ++ (* Create and return the firstboot directory. *) ++ let create_firstboot_dir (g : Guestfs.guestfs) = ++ let rec loop firstboot_dir firstboot_dir_win = function ++ | [] -> firstboot_dir, firstboot_dir_win ++ | dir :: path -> ++ let firstboot_dir = ++ if firstboot_dir = "" then "/" ^ dir else firstboot_dir // dir in ++ let firstboot_dir_win = firstboot_dir_win ^ "\\" ^ dir in ++ let firstboot_dir = g#case_sensitive_path firstboot_dir in ++ g#mkdir_p firstboot_dir; ++ loop firstboot_dir firstboot_dir_win path ++ in ++ loop "" "C:" ["Program Files"; "Guestfs"; "Firstboot"] ++ ++ let rec install_service (g : Guestfs.guestfs) root ++ firstboot_dir firstboot_dir_win = + (* Either rhsrvany.exe or pvvxsvc.exe must exist. + * + * (Check also that it's not a dangling symlink but a real file). +@@ -254,20 +269,7 @@ module Windows = struct + error (f_"One of rhsrvany.exe or pvvxsvc.exe is missing in %s. One of them is required in order to install Windows firstboot scripts. You can get one by building rhsrvany (https://github.com/rwmjones/rhsrvany)") + (virt_tools_data_dir ()) in + +- (* Create a directory for firstboot files in the guest. *) +- let firstboot_dir, firstboot_dir_win = +- let rec loop firstboot_dir firstboot_dir_win = function +- | [] -> firstboot_dir, firstboot_dir_win +- | dir :: path -> +- let firstboot_dir = +- if firstboot_dir = "" then "/" ^ dir else firstboot_dir // dir in +- let firstboot_dir_win = firstboot_dir_win ^ "\\" ^ dir in +- let firstboot_dir = g#case_sensitive_path firstboot_dir in +- g#mkdir_p firstboot_dir; +- loop firstboot_dir firstboot_dir_win path +- in +- loop "" "C:" ["Program Files"; "Guestfs"; "Firstboot"] in +- ++ (* Create a directory for firstboot scripts in the guest. *) + g#mkdir_p (firstboot_dir // "scripts"); + + (* Copy pvvxsvc or rhsrvany to the guest. *) +@@ -339,11 +341,25 @@ echo uninstalling firstboot service + "PWD", REG_SZ firstboot_dir_win ]; + ] in + reg_import reg regedits +- ); +- +- firstboot_dir ++ ) + end + ++let firstboot_dir (g : Guestfs.guestfs) root = ++ let typ = g#inspect_get_type root in ++ ++ match typ with ++ | "linux" -> ++ let dir = Linux.firstboot_dir in ++ g#mkdir_p dir; ++ dir, None ++ ++ | "windows" -> ++ let dir, dir_win = Windows.create_firstboot_dir g in ++ dir, Some dir_win ++ ++ | _ -> ++ error (f_"guest type %s is not supported") typ ++ + let script_count = ref 0 + + let add_firstboot_script (g : Guestfs.guestfs) root ?(prio = 5000) name +@@ -363,7 +379,8 @@ let add_firstboot_script (g : Guestfs.guestfs) root ?(prio = 5000) name + g#chmod 0o755 filename + + | "windows", _ -> +- let firstboot_dir = Windows.install_service g root in ++ let firstboot_dir, firstboot_dir_win = Windows.create_firstboot_dir g in ++ Windows.install_service g root firstboot_dir firstboot_dir_win; + let filename = firstboot_dir // "scripts" // filename ^ ".bat" in + g#write filename (String.unix2dos content) + +@@ -382,15 +399,18 @@ let add_firstboot_powershell g root ?prio name code = + *) + assert (g#inspect_get_type root = "windows"); + +- let windows_systemroot = g#inspect_get_windows_systemroot root in +- +- (* Create the temporary directory to put the Powershell file. *) +- let tempdir = sprintf "%s/Temp" windows_systemroot in ++ (* Place the Powershell script into firstboot_dir/Temp *) ++ let firstboot_dir, firstboot_dir_win = Windows.create_firstboot_dir g in ++ let tempdir = sprintf "%s/Temp" firstboot_dir in + g#mkdir_p tempdir; +- let ps_path = sprintf "%s/%s" tempdir name in ++ ++ let ps_path = sprintf "%s/%s.ps1" tempdir name in ++ let ps_path_win = sprintf "%s\\Temp\\%s.ps1" firstboot_dir_win name in + let code = String.concat "\r\n" code ^ "\r\n" in + g#write ps_path code; + +- let fb = sprintf "powershell.exe -ExecutionPolicy ByPass -NoProfile -file %s" +- ps_path in ++ (* Create a regular firstboot bat that just invokes powershell *) ++ let fb = ++ sprintf "powershell.exe -ExecutionPolicy ByPass -NoProfile -file \"%s\"" ++ ps_path_win in + add_firstboot_script g root ?prio name fb +diff --git a/common/mlcustomize/firstboot.mli b/common/mlcustomize/firstboot.mli +index 8231af65..34ff0690 100644 +--- a/common/mlcustomize/firstboot.mli ++++ b/common/mlcustomize/firstboot.mli +@@ -16,6 +16,23 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + *) + ++val firstboot_dir : Guestfs.guestfs -> string -> string * string option ++(** [firstboot_dir g root] ++ returns the path of the firstboot directory, creating it in ++ the guest if necessary. ++ ++ This returns the name of the directory as a guestfs path, and ++ optionally the name as a Windows path (only for Windows guests). ++ ++ For Linux this could be [/usr/lib/virt-sysprep, None] ++ ++ For Windows this could be ["/Program Files/Guestfs/Firstboot", ++ Some "C:\Program Files\Guestfs\Firstboot"] ++ ++ Additional files that are used during firstboot can be placed ++ in this directory, but be careful not to conflict with files ++ and scripts added by the firstboot process itself. *) ++ + val add_firstboot_script : Guestfs.guestfs -> string -> ?prio:int -> string -> + string -> unit + (** [add_firstboot_script g root prio name content] adds a firstboot +diff --git a/common/mlcustomize/inject_virtio_win.ml b/common/mlcustomize/inject_virtio_win.ml +index eee93669..b04a3b38 100644 +--- a/common/mlcustomize/inject_virtio_win.ml ++++ b/common/mlcustomize/inject_virtio_win.ml +@@ -592,11 +592,11 @@ and configure_qemu_ga t files = + add "# Run qemu-ga installers"; + List.iter ( + fun msi_path -> +- add (sprintf "C:\\%s /norestart /qn /l+*vx C:\\%s.log" ++ add (sprintf "Start-Process -Wait -FilePath \"C:\\%s\" -ArgumentList \"/norestart\",\"/qn\",\"/l+*vx\",\"C:\\%s.log\"" + msi_path msi_path) + ) files; + +- Firstboot.add_firstboot_powershell t.g t.root "install-qemu-ga.ps1" !script ++ Firstboot.add_firstboot_powershell t.g t.root "install-qemu-ga" !script + + and configure_blnsvr t blnsvr = + let cmd = sprintf "\ +diff --git a/convert/convert_windows.ml b/convert/convert_windows.ml +index 2d6e2059..52ca5bbe 100644 +--- a/convert/convert_windows.ml ++++ b/convert/convert_windows.ml +@@ -397,7 +397,7 @@ let convert (g : G.guestfs) _ inspect i_firmware block_driver _ static_ips = + %systemroot%\\Sysnative\\PnPutil -i -a \ + %systemroot%\\Drivers\\Virtio\\*.inf" in + +- (* Set priority higher than that of "v2vnetcf.ps1" firstboot script. *) ++ (* Set priority higher than that of "network-configure" firstboot script. *) + Firstboot.add_firstboot_script g inspect.i_root ~prio:2000 + "pnputil install drivers" fb_script; + +@@ -674,7 +674,7 @@ let convert (g : G.guestfs) _ inspect i_firmware block_driver _ static_ips = + * Powershell script which runs at boot. + *) + if static_ips <> [] then ( +- let psh_filename = "v2vnetcf.ps1" in ++ let psh_filename = "network-configure" in + let psh = ref [] in + let add = List.push_back psh in + diff --git a/0003-common-mlcustomize-Inject-qemu-ga-blnsvr-into-firstb.patch b/0003-common-mlcustomize-Inject-qemu-ga-blnsvr-into-firstb.patch new file mode 100644 index 0000000..ce13d10 --- /dev/null +++ b/0003-common-mlcustomize-Inject-qemu-ga-blnsvr-into-firstb.patch @@ -0,0 +1,116 @@ +From 168eacf977ca49e96bc63ddc4109c27515ac0277 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Thu, 1 Aug 2024 10:36:52 +0100 +Subject: [PATCH] common: mlcustomize: Inject qemu-ga & blnsvr into + /Temp + +Update common submodule to pick up this further change which should +mean that for all Windows conversions, everything is confined to +C:\Program Files\Guestfs\Firstboot (except the virtio drivers +themselves). + +Richard W.M. Jones (1): + mlcustomize: Inject qemu-ga & blnsvr into /Temp +--- + common | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Submodule common d489469f..04116678: +diff --git a/common/mlcustomize/inject_virtio_win.ml b/common/mlcustomize/inject_virtio_win.ml +index b04a3b38..2981bff5 100644 +--- a/common/mlcustomize/inject_virtio_win.ml ++++ b/common/mlcustomize/inject_virtio_win.ml +@@ -263,14 +263,28 @@ let rec inject_virtio_win_drivers ({ g } as t) reg = + } + ) + +-and inject_qemu_ga t = +- let msi_files = copy_qemu_ga t in ++and inject_qemu_ga ({ g; root } as t) = ++ (* Copy the qemu-ga MSI(s) to the guest. *) ++ let dir, dir_win = Firstboot.firstboot_dir g root in ++ let dir_win = Option.value dir_win ~default:dir in ++ let tempdir = sprintf "%s/Temp" dir in ++ let tempdir_win = sprintf "%s\\Temp" dir_win in ++ g#mkdir_p tempdir; ++ ++ let msi_files = copy_qemu_ga t tempdir in + if msi_files <> [] then +- configure_qemu_ga t msi_files; ++ configure_qemu_ga t tempdir_win msi_files; + msi_files <> [] (* return true if we found some qemu-ga MSI files *) + +-and inject_blnsvr t = +- let files = copy_blnsvr t in ++and inject_blnsvr ({ g; root } as t) = ++ (* Copy the files to the guest. *) ++ let dir, dir_win = Firstboot.firstboot_dir g root in ++ let dir_win = Option.value dir_win ~default:dir in ++ let tempdir = sprintf "%s/Temp" dir in ++ let tempdir_win = sprintf "%s\\Temp" dir_win in ++ g#mkdir_p tempdir; ++ ++ let files = copy_blnsvr t tempdir in + match files with + | [] -> false (* Didn't find or install anything. *) + +@@ -278,7 +292,7 @@ and inject_blnsvr t = + * drivers/by-driver). Pick the first. + *) + | blnsvr :: _ -> +- configure_blnsvr t blnsvr; ++ configure_blnsvr t tempdir_win blnsvr; + true + + and add_guestor_to_registry t ((g, root) as reg) drv_name drv_pciid = +@@ -360,13 +374,13 @@ and copy_drivers t driverdir = + (fun () -> + error (f_"root directory ‘/’ is missing from the virtio-win directory or ISO.\n\nThis should not happen and may indicate that virtio-win or virt-v2v is broken in some way. Please report this as a bug with a full debug log.")) + +-and copy_qemu_ga t = +- copy_from_virtio_win t "/" "/" (virtio_iso_path_matches_qemu_ga t) ++and copy_qemu_ga t tempdir = ++ copy_from_virtio_win t "/" tempdir (virtio_iso_path_matches_qemu_ga t) + (fun () -> + error (f_"root directory ‘/’ is missing from the virtio-win directory or ISO.\n\nThis should not happen and may indicate that virtio-win or virt-v2v is broken in some way. Please report this as a bug with a full debug log.")) + +-and copy_blnsvr t = +- copy_from_virtio_win t "/" "/" (virtio_iso_path_matches_blnsvr t) ++and copy_blnsvr t tempdir = ++ copy_from_virtio_win t "/" tempdir (virtio_iso_path_matches_blnsvr t) + (fun () -> + error (f_"root directory ‘/’ is missing from the virtio-win directory or ISO.\n\nThis should not happen and may indicate that virtio-win or virt-v2v is broken in some way. Please report this as a bug with a full debug log.")) + +@@ -578,7 +592,7 @@ and copy_from_libosinfo { g; i_osinfo; i_arch } destdir = + (* Install qemu-ga. [files] is the non-empty list of possible qemu-ga + * installers we detected. + *) +-and configure_qemu_ga t files = ++and configure_qemu_ga t tempdir_win files = + let script = ref [] in + let add = List.push_back script in + +@@ -591,16 +605,17 @@ and configure_qemu_ga t files = + add ""; + add "# Run qemu-ga installers"; + List.iter ( +- fun msi_path -> +- add (sprintf "Start-Process -Wait -FilePath \"C:\\%s\" -ArgumentList \"/norestart\",\"/qn\",\"/l+*vx\",\"C:\\%s.log\"" +- msi_path msi_path) ++ fun msi -> ++ (* [`] is an escape char for quotes *) ++ add (sprintf "Start-Process -Wait -FilePath \"%s\\%s\" -ArgumentList \"/norestart\",\"/qn\",\"/l+*vx\",\"`\"%s\\%s.log`\"\"" ++ tempdir_win msi tempdir_win msi) + ) files; + + Firstboot.add_firstboot_powershell t.g t.root "install-qemu-ga" !script + +-and configure_blnsvr t blnsvr = ++and configure_blnsvr t tempdir_win blnsvr = + let cmd = sprintf "\ + @echo off\n\ + echo Installing %s\n\ +- c:\\%s -i\n" blnsvr blnsvr in +- Firstboot.add_firstboot_script t.g t.root (sprintf "install-%s" blnsvr) cmd ++ \"%s\\%s\" -i\n" blnsvr tempdir_win blnsvr in ++ Firstboot.add_firstboot_script t.g t.root "install-blnsvr" cmd diff --git a/0004-docs-Add-a-note-about-removal-of-VMware-Tools-on-Win.patch b/0004-docs-Add-a-note-about-removal-of-VMware-Tools-on-Win.patch new file mode 100644 index 0000000..65d461a --- /dev/null +++ b/0004-docs-Add-a-note-about-removal-of-VMware-Tools-on-Win.patch @@ -0,0 +1,45 @@ +From c952f310c902e438a8b0b5240a4b486b698bede8 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Mon, 5 Aug 2024 10:08:34 +0100 +Subject: [PATCH] docs: Add a note about removal of VMware Tools on Windows + +We use VMware's recommended method for removal, but we know from +experience that this rarely works. The alternate method being +proposed involves making very invasive changes to the Registry and +filesystem, which are inappropriate for virt-v2v to do and highly +risky. Therefore simply document this, with notes for the virt-v2v +user if they want to try the risky method. + +Fixes: https://issues.redhat.com/browse/RHEL-51169 +Thanks: Yan Vugenfirer +Reported-by: Ming Xie +--- + docs/virt-v2v.pod | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod +index dfe92d77..92941026 100644 +--- a/docs/virt-v2v.pod ++++ b/docs/virt-v2v.pod +@@ -1299,6 +1299,21 @@ B Take care not to interrupt the automatic driver installation + process when logging in to the guest for the first time, as this may + prevent the guest from subsequently booting correctly. + ++=head3 Removing VMware Tools from Windows guests ++ ++Virt-v2v attempts to remove VMware Tools. For Windows guests this is ++supposed to happen during the first boot after conversion. ++ ++We use VMware's recommended uninstallation method as that is the ++safest choice. However our experience has shown that this method ++usually fails. If so, VMware Tools must be removed by some other ++method. ++ ++One possible method is described here: ++L ++You should carefully check this script since it makes very invasive ++changes to the Windows Registry and filesystem. ++ + =head2 Free space for conversion + + =head3 Free space in the guest diff --git a/0005-Update-common-submodule.patch b/0005-Update-common-submodule.patch new file mode 100644 index 0000000..c2b6872 --- /dev/null +++ b/0005-Update-common-submodule.patch @@ -0,0 +1,25 @@ +From 7bc9b115baba6df2969451cd6907e2d7543ef22d Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Mon, 5 Aug 2024 10:18:31 +0100 +Subject: [PATCH] Update common submodule + +Richard W.M. Jones (1): + mlcustomize: Write qemu-ga log file name to log.txt +--- + common | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Submodule common 04116678..7b84a370: +diff --git a/common/mlcustomize/inject_virtio_win.ml b/common/mlcustomize/inject_virtio_win.ml +index 2981bff5..afec1e45 100644 +--- a/common/mlcustomize/inject_virtio_win.ml ++++ b/common/mlcustomize/inject_virtio_win.ml +@@ -606,6 +606,8 @@ and configure_qemu_ga t tempdir_win files = + add "# Run qemu-ga installers"; + List.iter ( + fun msi -> ++ add (sprintf "Write-Host \"Writing log to %s\\%s.log\"" ++ tempdir_win msi); + (* [`] is an escape char for quotes *) + add (sprintf "Start-Process -Wait -FilePath \"%s\\%s\" -ArgumentList \"/norestart\",\"/qn\",\"/l+*vx\",\"`\"%s\\%s.log`\"\"" + tempdir_win msi tempdir_win msi) diff --git a/0006-Pull-in-a-fix-to-make-Windows-firstboot-more-reliabl.patch b/0006-Pull-in-a-fix-to-make-Windows-firstboot-more-reliabl.patch new file mode 100644 index 0000000..1c96f71 --- /dev/null +++ b/0006-Pull-in-a-fix-to-make-Windows-firstboot-more-reliabl.patch @@ -0,0 +1,78 @@ +From 50f005f8b7034916588855c15b10a0195bf54b23 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Thu, 8 Aug 2024 10:40:24 +0100 +Subject: [PATCH] Pull in a fix to make Windows firstboot more reliable. + +Update the common submodule to get: + +Richard W.M. Jones (2): + mlcustomize: Add some comments to firstboot batch file + mlcustomize: Reboot Windows between each firstboot script + +Document that Windows may now reboot several times after conversion. +--- + common | 2 +- + docs/virt-v2v.pod | 9 ++++++--- + 2 files changed, 7 insertions(+), 4 deletions(-) + +Submodule common 7b84a370..a7883967: +diff --git a/common/mlcustomize/firstboot.ml b/common/mlcustomize/firstboot.ml +index 3bbba714..52e76401 100644 +--- a/common/mlcustomize/firstboot.ml ++++ b/common/mlcustomize/firstboot.ml +@@ -278,6 +278,9 @@ module Windows = struct + (* Write a firstboot.bat control script which just runs the other + * scripts in the directory. Note we need to use CRLF line endings + * in this script. ++ * ++ * XXX It would be better to use powershell here. For some ideas see ++ * https://github.com/HCK-CI/HLK-Setup-Scripts/ + *) + let firstboot_script = sprintf "\ + @echo off +@@ -299,6 +302,7 @@ if not exist \"%%scripts_done%%\" ( + mkdir \"%%scripts_done%%\" + ) + ++:: Pick the next script to run. + for %%%%f in (\"%%scripts%%\"\\*.bat) do ( + echo running \"%%%%f\" + move \"%%%%f\" \"%%scripts_done%%\" +@@ -307,8 +311,17 @@ for %%%%f in (\"%%scripts%%\"\\*.bat) do ( + set elvl=!errorlevel! + echo .... exit code !elvl! + popd ++ ++ :: Reboot the computer. This is necessary to free any locked ++ :: files which may prevent later scripts from running. ++ shutdown /r /t 0 /y ++ ++ :: Exit the script (in case shutdown returns before rebooting). ++ :: On next boot, the whole firstboot service will be called again. ++ exit /b + ) + ++:: Fallthrough here if there are no scripts. + echo uninstalling firstboot service + \"%%firstboot%%\\%s\" -s firstboot uninstall + " firstboot_dir_win srvany in +diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod +index 92941026..587b4604 100644 +--- a/docs/virt-v2v.pod ++++ b/docs/virt-v2v.pod +@@ -1295,9 +1295,12 @@ The guest will be bootable after the offline conversion stage, but + will not yet have all necessary drivers installed to work correctly. + These will be installed automatically the first time the guest boots. + +-B Take care not to interrupt the automatic driver installation +-process when logging in to the guest for the first time, as this may +-prevent the guest from subsequently booting correctly. ++B Windows may reboot 4 or more times the first time after ++conversion. This is required to install the required drivers, guest ++agents, remove VMware Tools, and configure the network. Take care not ++to interrupt the automatic driver installation process when logging in ++to the guest for the first time, as this may prevent the guest from ++subsequently booting correctly. + + =head3 Removing VMware Tools from Windows guests + diff --git a/0007-docs-Restate-position-on-removal-of-VMware-Tools.patch b/0007-docs-Restate-position-on-removal-of-VMware-Tools.patch new file mode 100644 index 0000000..1b25ee4 --- /dev/null +++ b/0007-docs-Restate-position-on-removal-of-VMware-Tools.patch @@ -0,0 +1,30 @@ +From e9c0d63b22bcb4c31cfaac00fc1271713c8bd3b3 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Thu, 8 Aug 2024 10:56:16 +0100 +Subject: [PATCH] docs: Restate position on removal of VMware Tools + +With the "reboot after every step" change made in the previous commit, +it seems removal of VMware Tools is now more reliable. Update the +notes about this. + +Updates: commit c952f310c902e438a8b0b5240a4b486b698bede8 +--- + docs/virt-v2v.pod | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod +index 587b4604..346be606 100644 +--- a/docs/virt-v2v.pod ++++ b/docs/virt-v2v.pod +@@ -1308,9 +1308,8 @@ Virt-v2v attempts to remove VMware Tools. For Windows guests this is + supposed to happen during the first boot after conversion. + + We use VMware's recommended uninstallation method as that is the +-safest choice. However our experience has shown that this method +-usually fails. If so, VMware Tools must be removed by some other +-method. ++safest choice. If this fails, VMware Tools must be manually removed ++by some other method. + + One possible method is described here: + L diff --git a/0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch b/0008-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch similarity index 94% rename from 0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch rename to 0008-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch index 14a5d7a..9cf3aa6 100644 --- a/0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch +++ b/0008-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch @@ -1,4 +1,4 @@ -From d0705ab8c150628bbcfd667677242c4b33ff91d4 Mon Sep 17 00:00:00 2001 +From 73faaa69c32f09436ea8358c507102f2a0a0868e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 28 Sep 2014 19:14:43 +0100 Subject: [PATCH] RHEL: v2v: Select correct qemu binary for -o qemu mode diff --git a/0002-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch b/0009-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch similarity index 95% rename from 0002-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch rename to 0009-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch index 02cb292..7fca063 100644 --- a/0002-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch +++ b/0009-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch @@ -1,4 +1,4 @@ -From d5670ff4c8518bd8deaf360afb9dddf8fa8dabaf Mon Sep 17 00:00:00 2001 +From b3860f7f91c5c239d06de4a260b8c312f9b49387 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 30 Sep 2014 10:50:27 +0100 Subject: [PATCH] RHEL: v2v: Disable the --qemu-boot / -oo qemu-boot option @@ -44,7 +44,7 @@ index d2a1c270..0be37f5e 100644 =item B<-o null> diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod -index b53face6..725d6436 100644 +index 346be606..81a4b45a 100644 --- a/docs/virt-v2v.pod +++ b/docs/virt-v2v.pod @@ -146,11 +146,6 @@ Since F contains the path(s) to the guest disk @@ -107,10 +107,10 @@ index 07dae8c2..b6f24565 100644 let output_storage = match options.output_storage with diff --git a/v2v/v2v.ml b/v2v/v2v.ml -index 3b2eafbd..696ef75e 100644 +index 48c8cfba..fca5f6e9 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml -@@ -275,8 +275,6 @@ let rec main () = +@@ -277,8 +277,6 @@ let rec main () = s_"Same as ‘-ip filename’"; [ L"print-source" ], Getopt.Set print_source, s_"Print source and stop"; diff --git a/0003-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch b/0010-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch similarity index 92% rename from 0003-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch rename to 0010-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch index 890f187..b91cdf8 100644 --- a/0003-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch +++ b/0010-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch @@ -1,4 +1,4 @@ -From 2f89991b6a7c95535f12a029721ea2210bfdd6e4 Mon Sep 17 00:00:00 2001 +From 9b602a74f1cb359a281a80d944921d6d09a38bc8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 24 Apr 2015 09:45:41 -0400 Subject: [PATCH] RHEL: Fix list of supported sound cards to match RHEL qemu diff --git a/0004-RHEL-Fixes-for-libguestfs-winsupport.patch b/0011-RHEL-Fixes-for-libguestfs-winsupport.patch similarity index 97% rename from 0004-RHEL-Fixes-for-libguestfs-winsupport.patch rename to 0011-RHEL-Fixes-for-libguestfs-winsupport.patch index 9d4eb55..a0179bd 100644 --- a/0004-RHEL-Fixes-for-libguestfs-winsupport.patch +++ b/0011-RHEL-Fixes-for-libguestfs-winsupport.patch @@ -1,4 +1,4 @@ -From d747d7157d9dd472d0834c6c2531a76752823b4b Mon Sep 17 00:00:00 2001 +From 024513d941b74936c1cf13bcb7375117004f6ba5 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 30 Aug 2015 03:21:57 -0400 Subject: [PATCH] RHEL: Fixes for libguestfs-winsupport. @@ -18,7 +18,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=2187961#c1 6 files changed, 28 insertions(+), 4 deletions(-) diff --git a/convert/convert.ml b/convert/convert.ml -index d1dfcae8..e424930c 100644 +index 344c5858..ecc48ad4 100644 --- a/convert/convert.ml +++ b/convert/convert.ml @@ -52,6 +52,7 @@ let rec convert dir options source = diff --git a/0005-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch b/0012-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch similarity index 89% rename from 0005-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch rename to 0012-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch index 696b8ab..3de3678 100644 --- a/0005-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch +++ b/0012-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch @@ -1,4 +1,4 @@ -From 9798d8576e607684edc4f9b0179a1d688f55c13e Mon Sep 17 00:00:00 2001 +From a3b4f52cd0e74486b13cbb4d0de007c047afe2cd Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 2 Mar 2017 14:21:37 +0100 Subject: [PATCH] RHEL: v2v: -i disk: force VNC as display (RHBZ#1372671) @@ -9,7 +9,7 @@ The SDL output mode is not supported in RHEL's qemu-kvm. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/input/input_disk.ml b/input/input_disk.ml -index 279250fe..c6b819c0 100644 +index cf1f811b..27fc80de 100644 --- a/input/input_disk.ml +++ b/input/input_disk.ml @@ -77,7 +77,7 @@ module Disk = struct diff --git a/0006-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch b/0013-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch similarity index 97% rename from 0006-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch rename to 0013-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch index c2f6830..a58efcb 100644 --- a/0006-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch +++ b/0013-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch @@ -1,4 +1,4 @@ -From 9dd75c0f10fa41fb5455a9a2234ed22193c2c8cd Mon Sep 17 00:00:00 2001 +From 3435557683f568e03656adde0af20e5f3d63d5f1 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Tue, 26 Mar 2019 09:42:25 +0100 Subject: [PATCH] RHEL: point to KB for supported v2v hypervisors/guests diff --git a/0007-RHEL-Remove-input-from-Xen.patch b/0014-RHEL-Remove-input-from-Xen.patch similarity index 98% rename from 0007-RHEL-Remove-input-from-Xen.patch rename to 0014-RHEL-Remove-input-from-Xen.patch index 32e1b65..4476199 100644 --- a/0007-RHEL-Remove-input-from-Xen.patch +++ b/0014-RHEL-Remove-input-from-Xen.patch @@ -1,4 +1,4 @@ -From 08d26da78ac9c4e19d3f0e6fc5edbc324d4704d4 Mon Sep 17 00:00:00 2001 +From a1dcb4c0bc5670eb739115909bbe08eeefea416a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 8 Jul 2024 09:35:54 +0100 Subject: [PATCH] RHEL: Remove input from Xen @@ -229,7 +229,7 @@ index 4a0544f8..00000000 - -Copyright (C) 2009-2020 Red Hat Inc. diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod -index 725d6436..0c78f07c 100644 +index 81a4b45a..9c8dd834 100644 --- a/docs/virt-v2v.pod +++ b/docs/virt-v2v.pod @@ -11,7 +11,7 @@ virt-v2v - Convert a guest to use KVM @@ -515,10 +515,10 @@ index fa048231..00000000 - -module XenSSH : Input.INPUT diff --git a/inspector/inspector.ml b/inspector/inspector.ml -index c79dd687..9d9216c8 100644 +index 5dde6e8d..7b2211e4 100644 --- a/inspector/inspector.ml +++ b/inspector/inspector.ml -@@ -283,10 +283,6 @@ read the man page virt-v2v-inspector(1). +@@ -285,10 +285,6 @@ read the man page virt-v2v-inspector(1). | Some server, Some ("esx"|"gsx"|"vpx"), Some `VDDK -> (module Input_vddk.VDDK) @@ -530,10 +530,10 @@ index c79dd687..9d9216c8 100644 * deliberately not supporting this in new virt-v2v. Don't * use virt-v2v if a guest already runs on KVM. diff --git a/v2v/v2v.ml b/v2v/v2v.ml -index 696ef75e..be57a699 100644 +index fca5f6e9..6d44d987 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml -@@ -386,7 +386,6 @@ read the man page virt-v2v(1). +@@ -388,7 +388,6 @@ read the man page virt-v2v(1). pr "virt-v2v-2.0\n"; pr "libguestfs-rewrite\n"; pr "vcenter-https\n"; @@ -541,7 +541,7 @@ index 696ef75e..be57a699 100644 pr "vddk\n"; pr "colours-option\n"; pr "vdsm-compat-option\n"; -@@ -450,10 +449,6 @@ read the man page virt-v2v(1). +@@ -452,10 +451,6 @@ read the man page virt-v2v(1). | Some server, Some ("esx"|"gsx"|"vpx"), Some `VDDK -> (module Input_vddk.VDDK) diff --git a/0014-i-ova-Ignore-dot-underscore-files-in-OVA-files.patch b/0014-i-ova-Ignore-dot-underscore-files-in-OVA-files.patch deleted file mode 100644 index 1e4ac0c..0000000 --- a/0014-i-ova-Ignore-dot-underscore-files-in-OVA-files.patch +++ /dev/null @@ -1,43 +0,0 @@ -From de867ec1e519a621664cba25ad5e778da3dfec1e Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Thu, 25 Jul 2024 08:53:46 +0100 -Subject: [PATCH] -i ova: Ignore dot-underscore-files in OVA files - -I received an OVA created by a mac which contained various files -prefixed by "._" that contain some sort of extra information. Ignore -those files when decoding OVAs: - -$ tar tvf win22ktest.tar 2>/dev/null -drwxr-xr-x markd/staff 0 2024-07-23 18:23 win22test/ --rw-r--r-- markd/staff 619 2024-07-23 15:16 win22test/._win22test.mf --rw-r--r-- markd/staff 271 2024-07-23 15:16 win22test/win22test.mf --rw-r--r-- markd/staff 623 2024-07-23 15:16 win22test/._win22test-1.vmdk --rw-r--r-- markd/staff 8348649984 2024-07-23 15:16 win22test/win22test-1.vmdk --rw-r--r-- markd/staff 624 2024-07-23 15:00 win22test/._win22test-2.nvram --rw-r--r-- markd/staff 270840 2024-07-23 15:00 win22test/win22test-2.nvram --rw-r--r-- markd/staff 620 2024-07-23 15:00 win22test/._win22test.ovf --rw-r--r-- markd/staff 12052 2024-07-23 15:00 win22test/win22test.ovf - -(cherry picked from commit 3d26e48af39b26f3c8a368ce320555b995bdf20b) ---- - input/OVA.ml | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/input/OVA.ml b/input/OVA.ml -index 8d4606ef..1db337a7 100644 ---- a/input/OVA.ml -+++ b/input/OVA.ml -@@ -253,8 +253,13 @@ and find_files dir ext = - | [] -> [] - | dir :: rest -> - let files = Array.to_list (Sys.readdir dir) in -+ (* Ignore dot-underscore-files, added when using 'tar' on some Macs. *) -+ let files = -+ List.filter (fun x -> not (String.is_prefix x "._")) files in -+ (* Prefix with the directory to form a path. *) - let files = List.map (Filename.concat dir) files in - let dirs, files = List.partition Sys.is_directory files in -+ (* Only files with the given extension. *) - let files = - List.filter (fun x -> Filename.check_suffix x ext) files in - files @ loop (rest @ dirs) diff --git a/0008-RHEL-Remove-o-glance.patch b/0015-RHEL-Remove-o-glance.patch similarity index 94% rename from 0008-RHEL-Remove-o-glance.patch rename to 0015-RHEL-Remove-o-glance.patch index 08f1619..da401ae 100644 --- a/0008-RHEL-Remove-o-glance.patch +++ b/0015-RHEL-Remove-o-glance.patch @@ -1,4 +1,4 @@ -From dd73d862cf120a8acad70b71f9f6b525a35f2711 Mon Sep 17 00:00:00 2001 +From 194e3386a00560e02dc09cbf77f6a30b0c897ada Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 30 Jun 2021 11:15:52 +0100 Subject: [PATCH] RHEL: Remove -o glance @@ -98,7 +98,7 @@ index cd4862b1..54cd276e 100644 =head1 AUTHOR diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod -index 0c78f07c..b1669a59 100644 +index 9c8dd834..50424bc3 100644 --- a/docs/virt-v2v.pod +++ b/docs/virt-v2v.pod @@ -427,14 +427,6 @@ See L below. @@ -128,7 +128,7 @@ index 0c78f07c..b1669a59 100644 =item I<-o local> =item I<-o qemu> -@@ -1339,13 +1326,6 @@ See also L. +@@ -1356,13 +1343,6 @@ See also L. Because of how Cinder volumes are presented as F block devices, using I<-o openstack> normally requires that virt-v2v is run as root. @@ -167,10 +167,10 @@ index c0db9115..074b5e16 100755 set -e set -x diff --git a/v2v/v2v.ml b/v2v/v2v.ml -index be57a699..1bb44710 100644 +index 6d44d987..f51b55d9 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml -@@ -195,7 +195,6 @@ let rec main () = +@@ -197,7 +197,6 @@ let rec main () = if !output_mode <> `Not_set then error (f_"%s option used more than once on the command line") "-o"; match mode with @@ -178,7 +178,7 @@ index be57a699..1bb44710 100644 | "kubevirt" -> output_mode := `Kubevirt | "libvirt" -> output_mode := `Libvirt | "disk" | "local" -> output_mode := `Disk -@@ -255,7 +254,7 @@ let rec main () = +@@ -257,7 +256,7 @@ let rec main () = s_"Map network ‘in’ to ‘out’"; [ L"no-trim" ], Getopt.String ("-", no_trim_warning), s_"Ignored for backwards compatibility"; @@ -187,7 +187,7 @@ index be57a699..1bb44710 100644 s_"Set output mode (default: libvirt)"; [ M"oa" ], Getopt.String ("sparse|preallocated", set_output_alloc), s_"Set output allocation mode"; -@@ -323,8 +322,6 @@ virt-v2v -i libvirtxml guest-domain.xml -o local -os /var/tmp +@@ -325,8 +324,6 @@ virt-v2v -i libvirtxml guest-domain.xml -o local -os /var/tmp virt-v2v -i disk disk.img -o local -os /var/tmp @@ -196,7 +196,7 @@ index be57a699..1bb44710 100644 There is a companion front-end called \"virt-p2v\" which comes as an ISO or CD image that can be booted on physical machines. -@@ -398,7 +395,6 @@ read the man page virt-v2v(1). +@@ -400,7 +397,6 @@ read the man page virt-v2v(1). pr "input:libvirtxml\n"; pr "input:ova\n"; pr "input:vmx\n"; @@ -204,7 +204,7 @@ index be57a699..1bb44710 100644 pr "output:kubevirt\n"; pr "output:libvirt\n"; pr "output:local\n"; -@@ -491,7 +487,6 @@ read the man page virt-v2v(1). +@@ -493,7 +489,6 @@ read the man page virt-v2v(1). | `Disk -> (module Output_disk.Disk) | `Null -> (module Output_null.Null) | `QEmu -> (module Output_qemu.QEMU) diff --git a/0015-Update-common-submodule.patch b/0015-Update-common-submodule.patch deleted file mode 100644 index 6d74404..0000000 --- a/0015-Update-common-submodule.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 04a435eb547e8eb25e6666ea398948bec40c3a86 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Thu, 25 Jul 2024 09:08:41 +0100 -Subject: [PATCH] Update common submodule - -This pulls in the commits below which simplify the installation of -Qemu Guest Agent on Windows. - -Richard W.M. Jones (4): - mlcustomize: firstboot: Use Linux path for Powershell script path - mlcustomize: firstboot: Use powershell.exe instead of path - mlcustomize: firstboot: Use Powershell -NoProfile flag - mlcustomize: Revert delay installation of qemu-ga MSI - -Fixes: https://issues.redhat.com/browse/RHEL-49761 -(cherry picked from commit 4ba18d2d6d1155db7cd83641a650477c0a13dbec) ---- - common | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Submodule common 830cbdcf..5d1f5b84: -diff --git a/common/mlcustomize/firstboot.ml b/common/mlcustomize/firstboot.ml -index 5dc01234..4b9b910b 100644 ---- a/common/mlcustomize/firstboot.ml -+++ b/common/mlcustomize/firstboot.ml -@@ -387,16 +387,10 @@ let add_firstboot_powershell g root ?prio name code = - (* Create the temporary directory to put the Powershell file. *) - let tempdir = sprintf "%s/Temp" windows_systemroot in - g#mkdir_p tempdir; -+ let ps_path = sprintf "%s/%s" tempdir name in - let code = String.concat "\r\n" code ^ "\r\n" in -- g#write (sprintf "%s/%s" tempdir name) code; -+ g#write ps_path code; - -- (* Powershell interpreter. Should we check this exists? XXX *) -- let ps_exe = -- windows_systemroot ^ -- "\\System32\\WindowsPowerShell\\v1.0\\powershell.exe" in -- -- (* Windows path to the Powershell script. *) -- let ps_path = windows_systemroot ^ "\\Temp\\" ^ name in -- -- let fb = sprintf "%s -ExecutionPolicy ByPass -file %s" ps_exe ps_path in -+ let fb = sprintf "powershell.exe -ExecutionPolicy ByPass -NoProfile -file %s" -+ ps_path in - add_firstboot_script g root ?prio name fb -diff --git a/common/mlcustomize/inject_virtio_win.ml b/common/mlcustomize/inject_virtio_win.ml -index 4e0ed0e0..eee93669 100644 ---- a/common/mlcustomize/inject_virtio_win.ml -+++ b/common/mlcustomize/inject_virtio_win.ml -@@ -575,40 +575,28 @@ and copy_from_libosinfo { g; i_osinfo; i_arch } destdir = - ) driver.Libosinfo.files - with Not_found -> [] - -+(* Install qemu-ga. [files] is the non-empty list of possible qemu-ga -+ * installers we detected. -+ *) - and configure_qemu_ga t files = -+ let script = ref [] in -+ let add = List.push_back script in -+ -+ add "# Virt-v2v script which installs QEMU Guest Agent"; -+ add ""; -+ add "# Uncomment this line for lots of debug output."; -+ add "# Set-PSDebug -Trace 2"; -+ add ""; -+ add "Write-Host Installing QEMU Guest Agent"; -+ add ""; -+ add "# Run qemu-ga installers"; - List.iter ( - fun msi_path -> -- (* Windows is a trashfire. -- * https://stackoverflow.com/a/18730884 -- * https://bugzilla.redhat.com/show_bug.cgi?id=1895323 -- *) -- let psh_script = ref [] in -- let add = List.push_back psh_script in -+ add (sprintf "C:\\%s /norestart /qn /l+*vx C:\\%s.log" -+ msi_path msi_path) -+ ) files; - -- add "# Uncomment this line for lots of debug output."; -- add "# Set-PSDebug -Trace 2"; -- add ""; -- add "Write-Host Removing any previously scheduled qemu-ga installation"; -- add "schtasks.exe /Delete /TN Firstboot-qemu-ga /F"; -- add ""; -- add (sprintf -- "Write-Host Scheduling delayed installation of qemu-ga from %s" -- msi_path); -- add "$d = (get-date).AddSeconds(120)"; -- add "$dtfinfo = [System.Globalization.DateTimeFormatInfo]::CurrentInfo"; -- add "$sdp = $dtfinfo.ShortDatePattern"; -- add "$sdp = $sdp -replace 'y+', 'yyyy'"; -- add "$sdp = $sdp -replace 'M+', 'MM'"; -- add "$sdp = $sdp -replace 'd+', 'dd'"; -- add "schtasks.exe /Create /SC ONCE `"; -- add " /ST $d.ToString('HH:mm') /SD $d.ToString($sdp) `"; -- add " /RU SYSTEM /TN Firstboot-qemu-ga `"; -- add (sprintf " /TR \"C:\\%s /forcerestart /qn /l+*vx C:\\%s.log\"" -- msi_path msi_path); -- -- Firstboot.add_firstboot_powershell t.g t.root -- (sprintf "install-%s.ps1" msi_path) !psh_script; -- ) files -+ Firstboot.add_firstboot_powershell t.g t.root "install-qemu-ga.ps1" !script - - and configure_blnsvr t blnsvr = - let cmd = sprintf "\ diff --git a/0009-RHEL-Remove-the-in-place-option.patch b/0016-RHEL-Remove-the-in-place-option.patch similarity index 91% rename from 0009-RHEL-Remove-the-in-place-option.patch rename to 0016-RHEL-Remove-the-in-place-option.patch index 820cdad..7115d31 100644 --- a/0009-RHEL-Remove-the-in-place-option.patch +++ b/0016-RHEL-Remove-the-in-place-option.patch @@ -1,4 +1,4 @@ -From b884ce8cb851eb56d2e7d63397231547ecd2b0b3 Mon Sep 17 00:00:00 2001 +From e2898730dd01704c60ad3896afd03507feb59e27 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 2 Dec 2021 11:56:05 +0000 Subject: [PATCH] RHEL: Remove the --in-place option @@ -12,7 +12,7 @@ wish to support in RHEL. 3 files changed, 17 deletions(-) diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod -index b1669a59..9f5bb385 100644 +index 50424bc3..e22dc95f 100644 --- a/docs/virt-v2v.pod +++ b/docs/virt-v2v.pod @@ -24,9 +24,6 @@ virtualize those machines (physical to virtual, or p2v). @@ -36,7 +36,7 @@ index b1669a59..9f5bb385 100644 =head2 Other virt-v2v topics L — Supported hypervisors, virtualization -@@ -1607,7 +1600,6 @@ L, L, @@ -57,10 +57,10 @@ index 723a6506..4bfa1c7a 100644 test-v2v-inspector.sh \ test-v2v-mac.sh \ diff --git a/v2v/v2v.ml b/v2v/v2v.ml -index 1bb44710..a30019ac 100644 +index f51b55d9..a61b055e 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml -@@ -217,12 +217,6 @@ let rec main () = +@@ -219,12 +219,6 @@ let rec main () = warning (f_"the --vmtype option has been removed and now does nothing") in @@ -73,7 +73,7 @@ index 1bb44710..a30019ac 100644 let argspec = [ [ L"bandwidth" ], Getopt.String ("bps", set_string_option_once "--bandwidth" bandwidth), s_"Set bandwidth to bits per sec"; -@@ -246,8 +240,6 @@ let rec main () = +@@ -248,8 +242,6 @@ let rec main () = s_"Use password from file to connect to input hypervisor"; [ M"it" ], Getopt.String ("transport", set_string_option_once "-it" input_transport), s_"Input transport"; diff --git a/0010-RHEL-tests-Remove-btrfs-test.patch b/0017-RHEL-tests-Remove-btrfs-test.patch similarity index 91% rename from 0010-RHEL-tests-Remove-btrfs-test.patch rename to 0017-RHEL-tests-Remove-btrfs-test.patch index 45367c2..7e7e352 100644 --- a/0010-RHEL-tests-Remove-btrfs-test.patch +++ b/0017-RHEL-tests-Remove-btrfs-test.patch @@ -1,4 +1,4 @@ -From 084bacf33e1340ce8aedc1d6acacce19d61f1b13 Mon Sep 17 00:00:00 2001 +From 5491bd28a055ff7248dd922c75aa3b9653ec488a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 5 Jul 2022 11:58:09 +0100 Subject: [PATCH] RHEL: tests: Remove btrfs test diff --git a/0011-RHEL-Remove-block-driver-option.patch b/0018-RHEL-Remove-block-driver-option.patch similarity index 91% rename from 0011-RHEL-Remove-block-driver-option.patch rename to 0018-RHEL-Remove-block-driver-option.patch index 0a05397..cbee5a7 100644 --- a/0011-RHEL-Remove-block-driver-option.patch +++ b/0018-RHEL-Remove-block-driver-option.patch @@ -1,4 +1,4 @@ -From 4e196b25e8a693ddac66bbdf9c34c5e28d310fa1 Mon Sep 17 00:00:00 2001 +From e75a874958d57ef19d3bbd1215c073267a9cc406 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 28 Apr 2023 12:28:19 +0100 Subject: [PATCH] RHEL: Remove --block-driver option @@ -37,7 +37,7 @@ index ce57e229..6e1c5363 100644 =item B<--colours> diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod -index 9f5bb385..59843d35 100644 +index e22dc95f..b94fc8b5 100644 --- a/docs/virt-v2v.pod +++ b/docs/virt-v2v.pod @@ -191,16 +191,6 @@ The options are silently ignored for other input methods. @@ -58,7 +58,7 @@ index 9f5bb385..59843d35 100644 =item B<--colours> diff --git a/in-place/in_place.ml b/in-place/in_place.ml -index e8c260c2..2049db16 100644 +index 1fbd29d3..1c690a54 100644 --- a/in-place/in_place.ml +++ b/in-place/in_place.ml @@ -43,7 +43,6 @@ let rec main () = @@ -69,7 +69,7 @@ index e8c260c2..2049db16 100644 let input_conn = ref None in let input_format = ref None in let input_password = ref None in -@@ -157,8 +156,6 @@ let rec main () = +@@ -159,8 +158,6 @@ let rec main () = let argspec = [ [ S 'b'; L"bridge" ], Getopt.String ("in:out", add_bridge), s_"Map bridge ‘in’ to ‘out’"; @@ -78,7 +78,7 @@ index e8c260c2..2049db16 100644 [ S 'i' ], Getopt.String ("disk|libvirt|libvirtxml|ova|vmx", set_input_mode), s_"Set input mode (default: libvirt)"; [ M"ic" ], Getopt.String ("uri", set_string_option_once "-ic" input_conn), -@@ -214,12 +211,6 @@ read the man page virt-v2v-in-place(1). +@@ -216,12 +213,6 @@ read the man page virt-v2v-in-place(1). (* Dereference the arguments. *) let args = List.rev !args in @@ -91,7 +91,7 @@ index e8c260c2..2049db16 100644 let input_conn = !input_conn in let input_mode = !input_mode in let print_source = !print_source in -@@ -303,7 +294,7 @@ read the man page virt-v2v-in-place(1). +@@ -305,7 +296,7 @@ read the man page virt-v2v-in-place(1). (* Get the conversion options. *) let conv_options = { @@ -113,7 +113,7 @@ index a380a9bf..1ec1a702 100644 test-v2v-mac.sh \ test-v2v-machine-readable.sh \ diff --git a/v2v/v2v.ml b/v2v/v2v.ml -index a30019ac..fb1ee64d 100644 +index a61b055e..64a0147c 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -48,7 +48,6 @@ let rec main () = @@ -124,7 +124,7 @@ index a30019ac..fb1ee64d 100644 let input_conn = ref None in let input_format = ref None in let input_password = ref None in -@@ -224,8 +223,6 @@ let rec main () = +@@ -226,8 +225,6 @@ let rec main () = s_"Set bandwidth dynamically from file"; [ S 'b'; L"bridge" ], Getopt.String ("in:out", add_bridge), s_"Map bridge ‘in’ to ‘out’"; @@ -133,7 +133,7 @@ index a30019ac..fb1ee64d 100644 [ L"compressed" ], Getopt.Unit (fun () -> set_output_option_compat "compressed" ""), s_"Compress output file (-of qcow2 only)"; [ S 'i' ], Getopt.String ("disk|libvirt|libvirtxml|ova|vmx", set_input_mode), -@@ -341,12 +338,6 @@ read the man page virt-v2v(1). +@@ -343,12 +340,6 @@ read the man page virt-v2v(1). (* Dereference the arguments. *) let args = List.rev !args in @@ -146,7 +146,7 @@ index a30019ac..fb1ee64d 100644 let input_conn = !input_conn in let input_mode = !input_mode in let input_transport = -@@ -513,7 +504,7 @@ read the man page virt-v2v(1). +@@ -515,7 +506,7 @@ read the man page virt-v2v(1). (* Get the conversion options. *) let conv_options = { diff --git a/0012-RHEL-Remove-o-rhv-o-rhv-upload-and-o-vdsm-modes.patch b/0019-RHEL-Remove-o-rhv-o-rhv-upload-and-o-vdsm-modes.patch similarity index 99% rename from 0012-RHEL-Remove-o-rhv-o-rhv-upload-and-o-vdsm-modes.patch rename to 0019-RHEL-Remove-o-rhv-o-rhv-upload-and-o-vdsm-modes.patch index 09408fc..87b1548 100644 --- a/0012-RHEL-Remove-o-rhv-o-rhv-upload-and-o-vdsm-modes.patch +++ b/0019-RHEL-Remove-o-rhv-o-rhv-upload-and-o-vdsm-modes.patch @@ -1,4 +1,4 @@ -From 16f4c800bf86c8e527daa69c5ff715ec88fdd763 Mon Sep 17 00:00:00 2001 +From c0f7a321feb08727609a160ac0c0f2c0adea68f2 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 8 Jul 2024 09:56:54 +0100 Subject: [PATCH] RHEL: Remove -o rhv, -o rhv-upload and -o vdsm modes @@ -359,7 +359,7 @@ index 2ce697f4..00000000 - -Copyright (C) 2009-2020 Red Hat Inc. diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod -index 59843d35..4dac1203 100644 +index b94fc8b5..f96fd69f 100644 --- a/docs/virt-v2v.pod +++ b/docs/virt-v2v.pod @@ -13,7 +13,7 @@ virt-v2v - Convert a guest to use KVM @@ -605,7 +605,7 @@ index 59843d35..4dac1203 100644 =item B<--print-source> Print information about the source guest and stop. This option is -@@ -1270,26 +1085,6 @@ require either root or a special user: +@@ -1287,26 +1102,6 @@ require either root or a special user: =over 4 @@ -632,7 +632,7 @@ index 59843d35..4dac1203 100644 =item Writing to libvirt When using I<-o libvirt>, you may need to run virt-v2v as root so that -@@ -1396,7 +1191,6 @@ virt-v2v binary. Typical output looks like this: +@@ -1413,7 +1208,6 @@ virt-v2v binary. Typical output looks like this: virt-v2v libguestfs-rewrite colours-option @@ -1089,7 +1089,7 @@ index 08f3f2d0..00000000 -module RHV : Output.OUTPUT diff --git a/output/output_rhv_upload.ml b/output/output_rhv_upload.ml deleted file mode 100644 -index d6fde169..00000000 +index 63624860..00000000 --- a/output/output_rhv_upload.ml +++ /dev/null @@ -1,520 +0,0 @@ @@ -1263,8 +1263,8 @@ index d6fde169..00000000 - manual.") - in - -- let error_unless_nbdkit_min_version config = -- let version = Nbdkit.version config in +- let error_unless_nbdkit_min_version () = +- let version = Nbdkit.version () in - if version < nbdkit_min_version then - error (f_"nbdkit is not new enough, you need to upgrade to nbdkit ≥ %s") - nbdkit_min_version_string @@ -1287,8 +1287,9 @@ index d6fde169..00000000 - (* Check that nbdkit was compiled with SELinux support (for the - * --selinux-label option). - *) -- let error_unless_nbdkit_compiled_with_selinux config = +- let error_unless_nbdkit_compiled_with_selinux () = - if have_selinux then ( +- let config = Nbdkit.config () in - let selinux = try List.assoc "selinux" config with Not_found -> "no" in - if selinux = "no" then - error (f_"nbdkit was compiled without SELinux support. You will \ @@ -1301,9 +1302,8 @@ index d6fde169..00000000 - Python_script.error_unless_python_interpreter_found (); - error_unless_ovirtsdk4_module_available (); - error_unless_nbdkit_working (); -- let config = Nbdkit.config () in -- error_unless_nbdkit_min_version config; -- error_unless_nbdkit_compiled_with_selinux config; +- error_unless_nbdkit_min_version (); +- error_unless_nbdkit_compiled_with_selinux (); - - (* Python code. *) - let precheck_script = @@ -4635,10 +4635,10 @@ index e8f8c538..00000000 -diff -u "$srcdir/test-v2v-o-vdsm-options.ovf.expected" \ - "$OVF" diff --git a/v2v/v2v.ml b/v2v/v2v.ml -index fb1ee64d..cfe3ac5d 100644 +index 64a0147c..35133b08 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml -@@ -199,11 +199,7 @@ let rec main () = +@@ -201,11 +201,7 @@ let rec main () = | "disk" | "local" -> output_mode := `Disk | "null" -> output_mode := `Null | "openstack" | "osp" | "rhosp" -> output_mode := `Openstack @@ -4650,7 +4650,7 @@ index fb1ee64d..cfe3ac5d 100644 | s -> error (f_"unknown -o option: %s") s in -@@ -243,7 +239,7 @@ let rec main () = +@@ -245,7 +241,7 @@ let rec main () = s_"Map network ‘in’ to ‘out’"; [ L"no-trim" ], Getopt.String ("-", no_trim_warning), s_"Ignored for backwards compatibility"; @@ -4659,7 +4659,7 @@ index fb1ee64d..cfe3ac5d 100644 s_"Set output mode (default: libvirt)"; [ M"oa" ], Getopt.String ("sparse|preallocated", set_output_alloc), s_"Set output allocation mode"; -@@ -281,18 +277,6 @@ let rec main () = +@@ -283,18 +279,6 @@ let rec main () = s_"Same as ‘-io vddk-thumbprint=thumbprint’"; [ L"vddk-transports" ], Getopt.String ("transports", set_input_option_compat "vddk-transports"), s_"Same as ‘-io vddk-transports=transports’"; @@ -4678,7 +4678,7 @@ index fb1ee64d..cfe3ac5d 100644 [ L"vmtype" ], Getopt.String ("-", vmtype_warning), s_"Ignored for backwards compatibility"; ] in -@@ -304,9 +288,6 @@ let rec main () = +@@ -306,9 +290,6 @@ let rec main () = virt-v2v -ic vpx://vcenter.example.com/Datacenter/esxi -os imported esx_guest @@ -4688,7 +4688,7 @@ index fb1ee64d..cfe3ac5d 100644 virt-v2v -i libvirtxml guest-domain.xml -o local -os /var/tmp virt-v2v -i disk disk.img -o local -os /var/tmp -@@ -368,7 +349,6 @@ read the man page virt-v2v(1). +@@ -370,7 +351,6 @@ read the man page virt-v2v(1). pr "vcenter-https\n"; pr "vddk\n"; pr "colours-option\n"; @@ -4696,7 +4696,7 @@ index fb1ee64d..cfe3ac5d 100644 pr "io/oo\n"; pr "mac-option\n"; pr "bandwidth-option\n"; -@@ -384,9 +364,6 @@ read the man page virt-v2v(1). +@@ -386,9 +366,6 @@ read the man page virt-v2v(1). pr "output:null\n"; pr "output:openstack\n"; pr "output:qemu\n"; @@ -4706,7 +4706,7 @@ index fb1ee64d..cfe3ac5d 100644 pr "convert:linux\n"; pr "convert:windows\n"; List.iter (pr "ovf:%s\n") Create_ovf.ovf_flavours; -@@ -471,10 +448,7 @@ read the man page virt-v2v(1). +@@ -473,10 +450,7 @@ read the man page virt-v2v(1). | `Null -> (module Output_null.Null) | `QEmu -> (module Output_qemu.QEMU) | `Kubevirt -> (module Output_kubevirt.Kubevirt) @@ -4718,7 +4718,7 @@ index fb1ee64d..cfe3ac5d 100644 let output_options = { Output.output_alloc = output_alloc; -@@ -499,7 +473,6 @@ read the man page virt-v2v(1). +@@ -501,7 +475,6 @@ read the man page virt-v2v(1). *) let remove_serial_console = match output_mode with diff --git a/0013-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch b/0020-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch similarity index 81% rename from 0013-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch rename to 0020-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch index 7aa94f9..30ad2b4 100644 --- a/0013-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch +++ b/0020-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch @@ -1,4 +1,4 @@ -From c76552605d636820e01d0ccfe7250539f65bd26e Mon Sep 17 00:00:00 2001 +From 2a8788ae6bdb392ee12e0e66a7b0c9faef20eb44 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 9 Jul 2024 11:30:09 +0100 Subject: [PATCH] RHEL: Add warning about virt-v2v-in-place not being supported @@ -9,10 +9,10 @@ Fixes: https://issues.redhat.com/browse/RHEL-40903 1 file changed, 3 insertions(+) diff --git a/in-place/in_place.ml b/in-place/in_place.ml -index 2049db16..b74dbc8a 100644 +index 1c690a54..a70e812b 100644 --- a/in-place/in_place.ml +++ b/in-place/in_place.ml -@@ -195,6 +195,9 @@ read the man page virt-v2v-in-place(1). +@@ -197,6 +197,9 @@ read the man page virt-v2v-in-place(1). let opthandle = create_standard_options argspec ~anon_fun ~key_opts:true ~machine_readable:true usage_msg in Getopt.parse opthandle.getopt; @@ -20,5 +20,5 @@ index 2049db16..b74dbc8a 100644 + It is almost always better to use virt-v2v instead of this tool."; + (* Print the version, easier than asking users to tell us. *) - debug "%s: %s %s (%s)" + debug "info: %s: %s %s (%s)" prog Config.package_name Config.package_version_full diff --git a/sources b/sources index d3310de..8cd4356 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-v2v-2.5.5.tar.gz) = 06c8ba67cb604387c5aa371815b0be333378eac2bc3672f6f5c61d6914ed93b49d72355a9e549aca1e3f6d4bf07b357b800aa4e30cd7fe14de05d39f1c4a4007 -SHA512 (virt-v2v-2.5.5.tar.gz.sig) = 74397d5d890018ac604d1f563ec2d2298c34dd01b406a90d8e3db52a0f80696938dd7d93a08c93130780a2b6e9f47c74c9eb9be5b7c7c2e0a4fdf72561d40d08 +SHA512 (virt-v2v-2.5.6.tar.gz) = 86cc41042518d1ea62627c6fa0605f42dcc397e7ddc3c549bcdc3f54e3703426c14f8b42e102483afb0fad818ff569e1440042c624e9fecf3d04f14233b7a3f5 +SHA512 (virt-v2v-2.5.6.tar.gz.sig) = 39d7fcdb88b1abe325b3f3c2e8bda506fb8ecf41d5adb09e7c6bcd84f881cb73a897c1556735c49e420955ae0cc79614c42930495088d8ae6a3bc0cf39ff93f9 diff --git a/virt-v2v.spec b/virt-v2v.spec index f2f3978..2a06dcc 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -6,8 +6,8 @@ Name: virt-v2v Epoch: 1 -Version: 2.5.5 -Release: 2%{?dist} +Version: 2.5.6 +Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM License: GPL-2.0-or-later AND LGPL-2.0-or-later @@ -27,21 +27,26 @@ Source3: copy-patches.sh # https://github.com/libguestfs/virt-v2v/commits/rhel-10.0 # Patches. -Patch0001: 0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch -Patch0002: 0002-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch -Patch0003: 0003-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch -Patch0004: 0004-RHEL-Fixes-for-libguestfs-winsupport.patch -Patch0005: 0005-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch -Patch0006: 0006-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch -Patch0007: 0007-RHEL-Remove-input-from-Xen.patch -Patch0008: 0008-RHEL-Remove-o-glance.patch -Patch0009: 0009-RHEL-Remove-the-in-place-option.patch -Patch0010: 0010-RHEL-tests-Remove-btrfs-test.patch -Patch0011: 0011-RHEL-Remove-block-driver-option.patch -Patch0012: 0012-RHEL-Remove-o-rhv-o-rhv-upload-and-o-vdsm-modes.patch -Patch0013: 0013-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch -Patch0014: 0014-i-ova-Ignore-dot-underscore-files-in-OVA-files.patch -Patch0015: 0015-Update-common-submodule.patch +Patch0001: 0001-docs-Note-that-mac-len-field-is-now-optional.patch +Patch0002: 0002-convert-More-robust-qemu-ga-installation-change-path.patch +Patch0003: 0003-common-mlcustomize-Inject-qemu-ga-blnsvr-into-firstb.patch +Patch0004: 0004-docs-Add-a-note-about-removal-of-VMware-Tools-on-Win.patch +Patch0005: 0005-Update-common-submodule.patch +Patch0006: 0006-Pull-in-a-fix-to-make-Windows-firstboot-more-reliabl.patch +Patch0007: 0007-docs-Restate-position-on-removal-of-VMware-Tools.patch +Patch0008: 0008-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch +Patch0009: 0009-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch +Patch0010: 0010-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch +Patch0011: 0011-RHEL-Fixes-for-libguestfs-winsupport.patch +Patch0012: 0012-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch +Patch0013: 0013-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch +Patch0014: 0014-RHEL-Remove-input-from-Xen.patch +Patch0015: 0015-RHEL-Remove-o-glance.patch +Patch0016: 0016-RHEL-Remove-the-in-place-option.patch +Patch0017: 0017-RHEL-tests-Remove-btrfs-test.patch +Patch0018: 0018-RHEL-Remove-block-driver-option.patch +Patch0019: 0019-RHEL-Remove-o-rhv-o-rhv-upload-and-o-vdsm-modes.patch +Patch0020: 0020-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch %if !0%{?rhel} # libguestfs hasn't been built on i686 for a while since there is no @@ -329,6 +334,10 @@ done %changelog +* Mon Aug 12 2024 Richard W.M. Jones - 1:2.5.6-1 +- Further fixes for QEMU Guest Agent install & VMware Tools removal + resolves: RHEL-50563 + * Thu Jul 25 2024 Richard W.M. Jones - 1:2.5.5-2 - Fix installation of QEMU Guest Agent resolves: RHEL-50563