mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-22 07:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

v2v: try to pick the right arch for qemu-ga pkgs

Browse Source 
Right now the code copies, and then tries to install, all the files
found for the directory of a distro.  This does not take into account
differences in the architectures of the packages available, so a x86_64
package must be installed only on x86_64 guests.

As solution, filter the packages using the typical suffix used by
packages (so architecture + file extension), to pick only packages
compatible with the current guest.
This commit is contained in:
Pino Toscano
2019-03-26 17:10:38 +01:00
parent 13ef175a7b
commit 78f08a15fa
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
v2v/windows_virtio.ml
View File

@@ -203,10 +203,19 @@ and install_linux_tools g inspect =
| Some os ->
let src_path = "linux" // os in
let dst_path = "/var/tmp" in
let pkg_arch = Linux.architecture_string inspect in
let pkg_ext = Linux.binary_package_extension inspect in
let package_suffixes = [
sprintf ".%s.%s" pkg_arch pkg_ext;
sprintf "_%s.%s" pkg_arch pkg_ext;
] in
let package_filter path _ =
List.exists (String.is_suffix path) package_suffixes
in
debug "locating packages in %s" src_path;
let packages =
copy_from_virtio_win g inspect src_path dst_path
(fun _ _ -> true)
package_filter
(fun () ->
warning (f_"guest tools directory ‘%s’ is missing from the virtio-win directory or ISO.\n\nGuest tools are only provided in the RHV Guest Tools ISO, so this can happen if you are using the version of virtio-win which contains just the virtio drivers. In this case only virtio drivers can be installed in the guest, and installation of Guest Tools will be skipped.")
src_path) in