From c71420acc42c70f011d974e9bd26991250d64af5 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 12 2019 16:33:45 +0000 Subject: import libguestfs-1.38.2-12.el7_6.2 --- diff --git a/SOURCES/0001-RHEL-7-Remove-libguestfs-live-RHBZ-798980.patch b/SOURCES/0001-RHEL-7-Remove-libguestfs-live-RHBZ-798980.patch index 8bbb1e9..85bbdf4 100644 --- a/SOURCES/0001-RHEL-7-Remove-libguestfs-live-RHBZ-798980.patch +++ b/SOURCES/0001-RHEL-7-Remove-libguestfs-live-RHBZ-798980.patch @@ -34,5 +34,5 @@ index 9af481fd9..974336ccd 100644 static int -- -2.17.2 +2.20.1 diff --git a/SOURCES/0002-RHEL-7-Remove-9p-APIs-from-RHEL-RHBZ-921710.patch b/SOURCES/0002-RHEL-7-Remove-9p-APIs-from-RHEL-RHBZ-921710.patch index 796cf91..95c2edc 100644 --- a/SOURCES/0002-RHEL-7-Remove-9p-APIs-from-RHEL-RHBZ-921710.patch +++ b/SOURCES/0002-RHEL-7-Remove-9p-APIs-from-RHEL-RHBZ-921710.patch @@ -368,5 +368,5 @@ index a049d66fe..5daec8a89 100644 gobject/src/optargs-ntfsclone_out.c gobject/src/optargs-ntfsfix.c -- -2.17.2 +2.20.1 diff --git a/SOURCES/0003-RHEL-7-Disable-unsupported-remote-drive-protocols-RH.patch b/SOURCES/0003-RHEL-7-Disable-unsupported-remote-drive-protocols-RH.patch index 97a1547..0877e03 100644 --- a/SOURCES/0003-RHEL-7-Disable-unsupported-remote-drive-protocols-RH.patch +++ b/SOURCES/0003-RHEL-7-Disable-unsupported-remote-drive-protocols-RH.patch @@ -607,5 +607,5 @@ index 19dd60a2f..583e031bd 100755 -grep -sq -- '-drive file=ssh://rich@example.com/disk.img,' "$DEBUG_QEMU_FILE" || fail -rm "$DEBUG_QEMU_FILE" -- -2.17.2 +2.20.1 diff --git a/SOURCES/0004-RHEL-7-Remove-User-Mode-Linux-RHBZ-1144197.patch b/SOURCES/0004-RHEL-7-Remove-User-Mode-Linux-RHBZ-1144197.patch index 90cc8e6..638708a 100644 --- a/SOURCES/0004-RHEL-7-Remove-User-Mode-Linux-RHBZ-1144197.patch +++ b/SOURCES/0004-RHEL-7-Remove-User-Mode-Linux-RHBZ-1144197.patch @@ -68,5 +68,5 @@ index b8825cf56..1acf8db27 100644 static int shutdown_uml (guestfs_h *g, void *datav, int check_for_errors) -- -2.17.2 +2.20.1 diff --git a/SOURCES/0005-RHEL-7-v2v-Select-correct-qemu-binary-for-o-qemu-mod.patch b/SOURCES/0005-RHEL-7-v2v-Select-correct-qemu-binary-for-o-qemu-mod.patch index bd6f372..df40a29 100644 --- a/SOURCES/0005-RHEL-7-v2v-Select-correct-qemu-binary-for-o-qemu-mod.patch +++ b/SOURCES/0005-RHEL-7-v2v-Select-correct-qemu-binary-for-o-qemu-mod.patch @@ -29,5 +29,5 @@ index 952660de2..72a4ec9b6 100644 let flag = Qemuopts.flag cmd and arg = Qemuopts.arg cmd -- -2.17.2 +2.20.1 diff --git a/SOURCES/0006-RHEL-7-v2v-Disable-the-qemu-boot-option-RHBZ-1147313.patch b/SOURCES/0006-RHEL-7-v2v-Disable-the-qemu-boot-option-RHBZ-1147313.patch index f9004e8..d2627a3 100644 --- a/SOURCES/0006-RHEL-7-v2v-Disable-the-qemu-boot-option-RHBZ-1147313.patch +++ b/SOURCES/0006-RHEL-7-v2v-Disable-the-qemu-boot-option-RHBZ-1147313.patch @@ -73,5 +73,5 @@ index 484e14747..1c06502ec 100644 =item B<--quiet> -- -2.17.2 +2.20.1 diff --git a/SOURCES/0007-RHEL-7-move-VIRTIO_DEVICE_NAME-macro-to-guestfs-inte.patch b/SOURCES/0007-RHEL-7-move-VIRTIO_DEVICE_NAME-macro-to-guestfs-inte.patch index 17caefe..66df5bb 100644 --- a/SOURCES/0007-RHEL-7-move-VIRTIO_DEVICE_NAME-macro-to-guestfs-inte.patch +++ b/SOURCES/0007-RHEL-7-move-VIRTIO_DEVICE_NAME-macro-to-guestfs-inte.patch @@ -54,5 +54,5 @@ index 47e8f37de..f6c494d69 100644 struct backend_direct_data { pid_t pid; /* Qemu PID. */ -- -2.17.2 +2.20.1 diff --git a/SOURCES/0008-RHEL-7-Revert-tests-rsync-Skip-this-test-when-the-ba.patch b/SOURCES/0008-RHEL-7-Revert-tests-rsync-Skip-this-test-when-the-ba.patch index e22c85e..7881f58 100644 --- a/SOURCES/0008-RHEL-7-Revert-tests-rsync-Skip-this-test-when-the-ba.patch +++ b/SOURCES/0008-RHEL-7-Revert-tests-rsync-Skip-this-test-when-the-ba.patch @@ -70,5 +70,5 @@ index c6d98cfd1..246396276 100755 guestfish --network -N test-rsync.img=fs -m /dev/sda1 <secrets[i].secret); free (data->secrets); -- -2.17.2 +2.20.1 diff --git a/SOURCES/0011-RHEL-7-Revert-launch-libvirt-Better-error-when-bridg.patch b/SOURCES/0011-RHEL-7-Revert-launch-libvirt-Better-error-when-bridg.patch index 0ccdef4..d0c9baf 100644 --- a/SOURCES/0011-RHEL-7-Revert-launch-libvirt-Better-error-when-bridg.patch +++ b/SOURCES/0011-RHEL-7-Revert-launch-libvirt-Better-error-when-bridg.patch @@ -82,5 +82,5 @@ index f0f52fba0..c709c4fe2 100644 ignore_errors (void *ignore, virErrorPtr ignore2) { -- -2.17.2 +2.20.1 diff --git a/SOURCES/0012-RHEL-7-Revert-appliance-add-dhcp-client-on-Mageia.patch b/SOURCES/0012-RHEL-7-Revert-appliance-add-dhcp-client-on-Mageia.patch index f7cf7ed..e1cea31 100644 --- a/SOURCES/0012-RHEL-7-Revert-appliance-add-dhcp-client-on-Mageia.patch +++ b/SOURCES/0012-RHEL-7-Revert-appliance-add-dhcp-client-on-Mageia.patch @@ -22,5 +22,5 @@ index 8ded2588a..d70451309 100644 gfs2-utils grub -- -2.17.2 +2.20.1 diff --git a/SOURCES/0013-RHEL-7-Revert-appliance-add-dhcpcd-and-gptfdisk-on-A.patch b/SOURCES/0013-RHEL-7-Revert-appliance-add-dhcpcd-and-gptfdisk-on-A.patch index dea1118..c83cd3d 100644 --- a/SOURCES/0013-RHEL-7-Revert-appliance-add-dhcpcd-and-gptfdisk-on-A.patch +++ b/SOURCES/0013-RHEL-7-Revert-appliance-add-dhcpcd-and-gptfdisk-on-A.patch @@ -24,5 +24,5 @@ index d70451309..81a8f0dba 100644 hivex iproute2 -- -2.17.2 +2.20.1 diff --git a/SOURCES/0014-RHEL-7-Revert-appliance-Use-dhclient-or-dhcpcd-inste.patch b/SOURCES/0014-RHEL-7-Revert-appliance-Use-dhclient-or-dhcpcd-inste.patch index b2fb65a..e623b9f 100644 --- a/SOURCES/0014-RHEL-7-Revert-appliance-Use-dhclient-or-dhcpcd-inste.patch +++ b/SOURCES/0014-RHEL-7-Revert-appliance-Use-dhclient-or-dhcpcd-inste.patch @@ -90,5 +90,5 @@ index 81a8f0dba..1e7d53481 100644 gfs2-utils grub -- -2.17.2 +2.20.1 diff --git a/SOURCES/0015-RHEL-7-Disable-alternate-Augeas-lenses.patch b/SOURCES/0015-RHEL-7-Disable-alternate-Augeas-lenses.patch index e7c0d88..90e6c2e 100644 --- a/SOURCES/0015-RHEL-7-Disable-alternate-Augeas-lenses.patch +++ b/SOURCES/0015-RHEL-7-Disable-alternate-Augeas-lenses.patch @@ -56,5 +56,5 @@ index 453251337..003fcd313 100644 return 0; } -- -2.17.2 +2.20.1 diff --git a/SOURCES/0016-RHEL-7-Fix-list-of-supported-sound-cards-to-match-RH.patch b/SOURCES/0016-RHEL-7-Fix-list-of-supported-sound-cards-to-match-RH.patch index e88d0d0..cabf116 100644 --- a/SOURCES/0016-RHEL-7-Fix-list-of-supported-sound-cards-to-match-RH.patch +++ b/SOURCES/0016-RHEL-7-Fix-list-of-supported-sound-cards-to-match-RH.patch @@ -30,5 +30,5 @@ index e880001eb..812d339e0 100644 (* Find the UEFI firmware. *) let find_uefi_firmware guest_arch = -- -2.17.2 +2.20.1 diff --git a/SOURCES/0017-RHEL-7-v2v-efi-Remove-references-to-Fedora-kraxel-s-.patch b/SOURCES/0017-RHEL-7-v2v-efi-Remove-references-to-Fedora-kraxel-s-.patch index f6606e9..b67cddf 100644 --- a/SOURCES/0017-RHEL-7-v2v-efi-Remove-references-to-Fedora-kraxel-s-.patch +++ b/SOURCES/0017-RHEL-7-v2v-efi-Remove-references-to-Fedora-kraxel-s-.patch @@ -39,5 +39,5 @@ index 812d339e0..436acb5f1 100644 | "aarch64" -> Uefi.uefi_aarch64_firmware | arch -> -- -2.17.2 +2.20.1 diff --git a/SOURCES/0018-RHEL-7-Reject-use-of-libguestfs-winsupport-features-.patch b/SOURCES/0018-RHEL-7-Reject-use-of-libguestfs-winsupport-features-.patch index 22ead55..bd758d9 100644 --- a/SOURCES/0018-RHEL-7-Reject-use-of-libguestfs-winsupport-features-.patch +++ b/SOURCES/0018-RHEL-7-Reject-use-of-libguestfs-winsupport-features-.patch @@ -43,5 +43,5 @@ index 0366866e2..8ecc63d0b 100644 * as a progress bar hint. *) -- -2.17.2 +2.20.1 diff --git a/SOURCES/0019-RHEL-7-daemon-umount-all-Hack-to-avoid-umount-sysroo.patch b/SOURCES/0019-RHEL-7-daemon-umount-all-Hack-to-avoid-umount-sysroo.patch index 4c605cb..19a9c45 100644 --- a/SOURCES/0019-RHEL-7-daemon-umount-all-Hack-to-avoid-umount-sysroo.patch +++ b/SOURCES/0019-RHEL-7-daemon-umount-all-Hack-to-avoid-umount-sysroo.patch @@ -36,5 +36,5 @@ index 61ce64449..b038a89c3 100644 for (i = 0; i < mounts.size; ++i) { CLEANUP_FREE char *err = NULL; -- -2.17.2 +2.20.1 diff --git a/SOURCES/0020-RHEL-7-Fix-tests-for-libguestfs-winsupport-7.2.patch b/SOURCES/0020-RHEL-7-Fix-tests-for-libguestfs-winsupport-7.2.patch index 05bbb7c..540e05b 100644 --- a/SOURCES/0020-RHEL-7-Fix-tests-for-libguestfs-winsupport-7.2.patch +++ b/SOURCES/0020-RHEL-7-Fix-tests-for-libguestfs-winsupport-7.2.patch @@ -89,5 +89,5 @@ index f1da222a9..ff94fe39b 100755 # We also update the Registry several times, for firstboot, and (ONLY -- -2.17.2 +2.20.1 diff --git a/SOURCES/0021-RHEL-7-Revert-v2v-Add-a-support-matrix-to-the-manual.patch b/SOURCES/0021-RHEL-7-Revert-v2v-Add-a-support-matrix-to-the-manual.patch index 1f96e1a..f639a16 100644 --- a/SOURCES/0021-RHEL-7-Revert-v2v-Add-a-support-matrix-to-the-manual.patch +++ b/SOURCES/0021-RHEL-7-Revert-v2v-Add-a-support-matrix-to-the-manual.patch @@ -121,5 +121,5 @@ index 1c06502ec..f33f9bf62 100644 =over 4 -- -2.17.2 +2.20.1 diff --git a/SOURCES/0022-RHEL-7-All-qemu-kvm-in-RHEL-7-supports-discard-of-qc.patch b/SOURCES/0022-RHEL-7-All-qemu-kvm-in-RHEL-7-supports-discard-of-qc.patch index eb20e0a..038f057 100644 --- a/SOURCES/0022-RHEL-7-All-qemu-kvm-in-RHEL-7-supports-discard-of-qc.patch +++ b/SOURCES/0022-RHEL-7-All-qemu-kvm-in-RHEL-7-supports-discard-of-qc.patch @@ -42,5 +42,5 @@ index 6159b5a52..1e52cf75b 100644 /* It's possible in future other formats will support discard, but * currently (qemu 1.7) none of them do. -- -2.17.2 +2.20.1 diff --git a/SOURCES/0023-RHEL-7-tests-Disable-daemon-tests-that-require-the-u.patch b/SOURCES/0023-RHEL-7-tests-Disable-daemon-tests-that-require-the-u.patch index 56f0461..468d9f9 100644 --- a/SOURCES/0023-RHEL-7-tests-Disable-daemon-tests-that-require-the-u.patch +++ b/SOURCES/0023-RHEL-7-tests-Disable-daemon-tests-that-require-the-u.patch @@ -24,5 +24,5 @@ index 053cad3e1..0d723fee4 100644 TESTS_ENVIRONMENT = $(top_builddir)/run --test -- -2.17.2 +2.20.1 diff --git a/SOURCES/0024-RHEL-7-v2v-Disable-the-virt-v2v-in-place-option.patch b/SOURCES/0024-RHEL-7-v2v-Disable-the-virt-v2v-in-place-option.patch index 708909a..1511b8e 100644 --- a/SOURCES/0024-RHEL-7-v2v-Disable-the-virt-v2v-in-place-option.patch +++ b/SOURCES/0024-RHEL-7-v2v-Disable-the-virt-v2v-in-place-option.patch @@ -278,5 +278,5 @@ index f33f9bf62..0e0fa0f64 100644 The I<--machine-readable> option can be used to make the output more -- -2.17.2 +2.20.1 diff --git a/SOURCES/0025-RHEL-7-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch b/SOURCES/0025-RHEL-7-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch index fe680fe..ad803c7 100644 --- a/SOURCES/0025-RHEL-7-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch +++ b/SOURCES/0025-RHEL-7-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch @@ -22,5 +22,5 @@ index 7ecd19fd3..e2b16cf70 100644 s_video = None; s_sound = None; -- -2.17.2 +2.20.1 diff --git a/SOURCES/0026-RHEL-7-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-143020.patch b/SOURCES/0026-RHEL-7-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-143020.patch index cc001a8..f6c49f9 100644 --- a/SOURCES/0026-RHEL-7-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-143020.patch +++ b/SOURCES/0026-RHEL-7-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-143020.patch @@ -23,5 +23,5 @@ index 0e0fa0f64..f8a937960 100644 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.17.2 +2.20.1 diff --git a/SOURCES/0027-RHEL-7-v2v-disable-unconfig-of-manually-installed-VM.patch b/SOURCES/0027-RHEL-7-v2v-disable-unconfig-of-manually-installed-VM.patch index a6dd519..e262228 100644 --- a/SOURCES/0027-RHEL-7-v2v-disable-unconfig-of-manually-installed-VM.patch +++ b/SOURCES/0027-RHEL-7-v2v-disable-unconfig-of-manually-installed-VM.patch @@ -32,5 +32,5 @@ index 4a7447fe1..7588fbf8e 100644 and unconfigure_citrix () = let pkgs = -- -2.17.2 +2.20.1 diff --git a/SOURCES/0028-v2v-Use-Std_utils.qemu_input_filename-instead-of-pre.patch b/SOURCES/0028-v2v-Use-Std_utils.qemu_input_filename-instead-of-pre.patch index 13192d7..caaae88 100644 --- a/SOURCES/0028-v2v-Use-Std_utils.qemu_input_filename-instead-of-pre.patch +++ b/SOURCES/0028-v2v-Use-Std_utils.qemu_input_filename-instead-of-pre.patch @@ -29,5 +29,5 @@ index 90173b018..6b9bdadf6 100644 [ "qemu-img"; "convert" ] @ (if not (quiet ()) then [ "-p" ] else []) @ -- -2.17.2 +2.20.1 diff --git a/SOURCES/0029-v2v-o-null-support-older-qemu-img-RHBZ-1580309.patch b/SOURCES/0029-v2v-o-null-support-older-qemu-img-RHBZ-1580309.patch index 59da6b5..fa1398f 100644 --- a/SOURCES/0029-v2v-o-null-support-older-qemu-img-RHBZ-1580309.patch +++ b/SOURCES/0029-v2v-o-null-support-older-qemu-img-RHBZ-1580309.patch @@ -106,5 +106,5 @@ index b93d53dc5..228c0b631 100644 method create_metadata _ _ _ _ _ _ = () end -- -2.17.2 +2.20.1 diff --git a/SOURCES/0030-v2v-ovf-Create-OVF-more-aligned-with-the-standard.patch b/SOURCES/0030-v2v-ovf-Create-OVF-more-aligned-with-the-standard.patch index 7f58c67..81e4a92 100644 --- a/SOURCES/0030-v2v-ovf-Create-OVF-more-aligned-with-the-standard.patch +++ b/SOURCES/0030-v2v-ovf-Create-OVF-more-aligned-with-the-standard.patch @@ -338,5 +338,5 @@ index c5e904ba1..ce286d327 100644 (* Write it to the metadata file. *) let file = vdsm_options.ovf_output // vdsm_options.vm_uuid ^ ".ovf" in -- -2.17.2 +2.20.1 diff --git a/SOURCES/0031-v2v-vdsm-add-vdsm-fixed-ovf-option.patch b/SOURCES/0031-v2v-vdsm-add-vdsm-fixed-ovf-option.patch index ddb2104..38f5bad 100644 --- a/SOURCES/0031-v2v-vdsm-add-vdsm-fixed-ovf-option.patch +++ b/SOURCES/0031-v2v-vdsm-add-vdsm-fixed-ovf-option.patch @@ -209,5 +209,5 @@ index f8a937960..d81a2339c 100644 =item B<--verbose> -- -2.17.2 +2.20.1 diff --git a/SOURCES/0032-v2v-OVF-Code-formatting.patch b/SOURCES/0032-v2v-OVF-Code-formatting.patch index 3bf6b8a..99bf8ae 100644 --- a/SOURCES/0032-v2v-OVF-Code-formatting.patch +++ b/SOURCES/0032-v2v-OVF-Code-formatting.patch @@ -120,5 +120,5 @@ index f1985ea86..bf3741e0f 100644 let item = e "Item" [] [ -- -2.17.2 +2.20.1 diff --git a/SOURCES/0033-v2v-DOM-Add-doc_to_string-function.patch b/SOURCES/0033-v2v-DOM-Add-doc_to_string-function.patch index 0c951ac..0e3214b 100644 --- a/SOURCES/0033-v2v-DOM-Add-doc_to_string-function.patch +++ b/SOURCES/0033-v2v-DOM-Add-doc_to_string-function.patch @@ -123,5 +123,5 @@ index 1aa89b7e7..99223c389 100644 (** Write the XML document to an output channel. *) -- -2.17.2 +2.20.1 diff --git a/SOURCES/0034-v2v-Add-op-output-password-file-option.patch b/SOURCES/0034-v2v-Add-op-output-password-file-option.patch index 8c7fc62..a214a42 100644 --- a/SOURCES/0034-v2v-Add-op-output-password-file-option.patch +++ b/SOURCES/0034-v2v-Add-op-output-password-file-option.patch @@ -134,5 +134,5 @@ index d81a2339c..4df3791a9 100644 The location of the storage for the converted guest. -- -2.17.2 +2.20.1 diff --git a/SOURCES/0035-v2v-cmdline-Move-definition-to-before-its-only-use.patch b/SOURCES/0035-v2v-cmdline-Move-definition-to-before-its-only-use.patch index 3799268..8e1cdf8 100644 --- a/SOURCES/0035-v2v-cmdline-Move-definition-to-before-its-only-use.patch +++ b/SOURCES/0035-v2v-cmdline-Move-definition-to-before-its-only-use.patch @@ -31,5 +31,5 @@ index bfdc250fc..9bd0e8afc 100644 let argspec = [ [ S 'b'; L"bridge" ], Getopt.String ("in:out", add_bridge), -- -2.17.2 +2.20.1 diff --git a/SOURCES/0036-v2v-Add-general-mechanism-for-input-and-output-optio.patch b/SOURCES/0036-v2v-Add-general-mechanism-for-input-and-output-optio.patch index 731c107..e28a465 100644 --- a/SOURCES/0036-v2v-Add-general-mechanism-for-input-and-output-optio.patch +++ b/SOURCES/0036-v2v-Add-general-mechanism-for-input-and-output-optio.patch @@ -1265,5 +1265,5 @@ index 4df3791a9..5dd888e77 100644 =head2 VDDK: DEBUGGING VDDK FAILURES -- -2.17.2 +2.20.1 diff --git a/SOURCES/0037-v2v-OVF-write-ovirt-id-attribute-for-the-OS-in-OVirt.patch b/SOURCES/0037-v2v-OVF-write-ovirt-id-attribute-for-the-OS-in-OVirt.patch index 06391fa..f4f28a7 100644 --- a/SOURCES/0037-v2v-OVF-write-ovirt-id-attribute-for-the-OS-in-OVirt.patch +++ b/SOURCES/0037-v2v-OVF-write-ovirt-id-attribute-for-the-OS-in-OVirt.patch @@ -243,5 +243,5 @@ index bf3741e0f..ccde960df 100644 | RHVExportStorageDomain -> e "Section" ["ovf:id", vm_uuid; "ovf:required", "false"; -- -2.17.2 +2.20.1 diff --git a/SOURCES/0038-v2v-OVF-fix-ovf-id-for-VirtualSystem-in-OVirt-flavou.patch b/SOURCES/0038-v2v-OVF-fix-ovf-id-for-VirtualSystem-in-OVirt-flavou.patch index b4716ae..c523c35 100644 --- a/SOURCES/0038-v2v-OVF-fix-ovf-id-for-VirtualSystem-in-OVirt-flavou.patch +++ b/SOURCES/0038-v2v-OVF-fix-ovf-id-for-VirtualSystem-in-OVirt-flavou.patch @@ -28,5 +28,5 @@ index ccde960df..c29b8421c 100644 e "Content" ["ovf:id", "out"; "xsi:type", "ovf:VirtualSystem_Type"] !content_subnodes -- -2.17.2 +2.20.1 diff --git a/SOURCES/0039-v2v-Add-o-rhv-upload-output-mode-RHBZ-1557273.patch b/SOURCES/0039-v2v-Add-o-rhv-upload-output-mode-RHBZ-1557273.patch index 6d61b0c..1adbdae 100644 --- a/SOURCES/0039-v2v-Add-o-rhv-upload-output-mode-RHBZ-1557273.patch +++ b/SOURCES/0039-v2v-Add-o-rhv-upload-output-mode-RHBZ-1557273.patch @@ -1760,5 +1760,5 @@ index 5dd888e77..62b726b8f 100644 virt-v2v from the RHV-M user interface, then behind the scenes the import is managed by VDSM using the I<-o vdsm> output mode (which end -- -2.17.2 +2.20.1 diff --git a/SOURCES/0040-v2v-refer-to-the-right-embed-script-in-EXTRA_DIST.patch b/SOURCES/0040-v2v-refer-to-the-right-embed-script-in-EXTRA_DIST.patch index 1b3883f..c48bb1c 100644 --- a/SOURCES/0040-v2v-refer-to-the-right-embed-script-in-EXTRA_DIST.patch +++ b/SOURCES/0040-v2v-refer-to-the-right-embed-script-in-EXTRA_DIST.patch @@ -24,5 +24,5 @@ index affc00a8b..0f8c5120b 100644 rhv-upload-plugin.py \ rhv-upload-precheck.py \ -- -2.17.2 +2.20.1 diff --git a/SOURCES/0041-v2v-o-rhv-upload-Don-t-require-of-raw-parameter.patch b/SOURCES/0041-v2v-o-rhv-upload-Don-t-require-of-raw-parameter.patch index 2002453..0dc340b 100644 --- a/SOURCES/0041-v2v-o-rhv-upload-Don-t-require-of-raw-parameter.patch +++ b/SOURCES/0041-v2v-o-rhv-upload-Don-t-require-of-raw-parameter.patch @@ -80,5 +80,5 @@ index 129461242..dc0d96d53 100644 error (f_"rhv-upload: -of %s: Only output format ‘raw’ or ‘qcow2’ is supported. If the input is in a different format then force one of these output formats by adding either ‘-of raw’ or ‘-of qcow2’ on the command line.") t.target_format in -- -2.17.2 +2.20.1 diff --git a/SOURCES/0042-v2v-o-rhv-upload-install-RHV-tools-RHBZ-1561828.patch b/SOURCES/0042-v2v-o-rhv-upload-install-RHV-tools-RHBZ-1561828.patch index cc69a36..c8e0dcb 100644 --- a/SOURCES/0042-v2v-o-rhv-upload-install-RHV-tools-RHBZ-1561828.patch +++ b/SOURCES/0042-v2v-o-rhv-upload-install-RHV-tools-RHBZ-1561828.patch @@ -27,5 +27,5 @@ index dc0d96d53..0152b8d5a 100644 let output_name = source.s_name in let json_params = -- -2.17.2 +2.20.1 diff --git a/SOURCES/0043-v2v-Map-Windows-Server-2012-R2-x86-64-to-ovirt-ID-25.patch b/SOURCES/0043-v2v-Map-Windows-Server-2012-R2-x86-64-to-ovirt-ID-25.patch index e513cf5..bbedcdb 100644 --- a/SOURCES/0043-v2v-Map-Windows-Server-2012-R2-x86-64-to-ovirt-ID-25.patch +++ b/SOURCES/0043-v2v-Map-Windows-Server-2012-R2-x86-64-to-ovirt-ID-25.patch @@ -26,5 +26,5 @@ index c29b8421c..190cf8bed 100644 | { i_type = "windows"; i_major_version = 10; i_minor_version = 0; i_arch = "i386" } -> -- -2.17.2 +2.20.1 diff --git a/SOURCES/0044-v2v-fix-build-rules-for-output_rhv_upload_-_source.m.patch b/SOURCES/0044-v2v-fix-build-rules-for-output_rhv_upload_-_source.m.patch index d3c5e77..20c867f 100644 --- a/SOURCES/0044-v2v-fix-build-rules-for-output_rhv_upload_-_source.m.patch +++ b/SOURCES/0044-v2v-fix-build-rules-for-output_rhv_upload_-_source.m.patch @@ -50,5 +50,5 @@ index 0f8c5120b..64bf5235c 100644 -include .depend -- -2.17.2 +2.20.1 diff --git a/SOURCES/0045-v2v-fix-rhevexp-typo-in-documentation.patch b/SOURCES/0045-v2v-fix-rhevexp-typo-in-documentation.patch index d36ddad..97ee2bf 100644 --- a/SOURCES/0045-v2v-fix-rhevexp-typo-in-documentation.patch +++ b/SOURCES/0045-v2v-fix-rhevexp-typo-in-documentation.patch @@ -33,5 +33,5 @@ index 62b726b8f..806225be0 100644 =item B<-op> file -- -2.17.2 +2.20.1 diff --git a/SOURCES/0046-v2v-add-and-use-Create_ovf.ovf_flavour_to_string.patch b/SOURCES/0046-v2v-add-and-use-Create_ovf.ovf_flavour_to_string.patch index 6febe38..9bba082 100644 --- a/SOURCES/0046-v2v-add-and-use-Create_ovf.ovf_flavour_to_string.patch +++ b/SOURCES/0046-v2v-add-and-use-Create_ovf.ovf_flavour_to_string.patch @@ -62,5 +62,5 @@ index 92b3fd122..9a1b748bc 100644 method supported_firmware = [ TargetBIOS ] -- -2.17.2 +2.20.1 diff --git a/SOURCES/0047-daemon-Move-lvmetad-to-early-in-the-appliance-boot-p.patch b/SOURCES/0047-daemon-Move-lvmetad-to-early-in-the-appliance-boot-p.patch index fd1ddba..087fe8c 100644 --- a/SOURCES/0047-daemon-Move-lvmetad-to-early-in-the-appliance-boot-p.patch +++ b/SOURCES/0047-daemon-Move-lvmetad-to-early-in-the-appliance-boot-p.patch @@ -221,5 +221,5 @@ index ad85a7cc4..9d877c104 100644 unlink (lvm_cache); -- -2.17.2 +2.20.1 diff --git a/SOURCES/0048-v2v-o-rhv-upload-Set-inactivity-timeout-RHBZ-1586198.patch b/SOURCES/0048-v2v-o-rhv-upload-Set-inactivity-timeout-RHBZ-1586198.patch index d13e22d..bce9c32 100644 --- a/SOURCES/0048-v2v-o-rhv-upload-Set-inactivity-timeout-RHBZ-1586198.patch +++ b/SOURCES/0048-v2v-o-rhv-upload-Set-inactivity-timeout-RHBZ-1586198.patch @@ -38,5 +38,5 @@ index 791c9e7d2..b4557b83c 100644 ) debug("transfer.id = %r" % transfer.id) -- -2.17.2 +2.20.1 diff --git a/SOURCES/0049-v2v-linux-fix-kernel-detection-when-split-in-differe.patch b/SOURCES/0049-v2v-linux-fix-kernel-detection-when-split-in-differe.patch index a47d5df..025bf69 100644 --- a/SOURCES/0049-v2v-linux-fix-kernel-detection-when-split-in-differe.patch +++ b/SOURCES/0049-v2v-linux-fix-kernel-detection-when-split-in-differe.patch @@ -106,5 +106,5 @@ index c047d6deb..24f61429d 100644 let kernel_supports what kconf = -- -2.17.2 +2.20.1 diff --git a/SOURCES/0050-New-API-inspect_get_osinfo.patch b/SOURCES/0050-New-API-inspect_get_osinfo.patch index 311471f..5f72cb1 100644 --- a/SOURCES/0050-New-API-inspect_get_osinfo.patch +++ b/SOURCES/0050-New-API-inspect_get_osinfo.patch @@ -132,5 +132,5 @@ index 000000000..816d317f1 + return safe_strdup (g, "unknown"); +} -- -2.17.2 +2.20.1 diff --git a/SOURCES/0051-inspector-show-the-per-OS-osinfo-guess-RHBZ-1544842.patch b/SOURCES/0051-inspector-show-the-per-OS-osinfo-guess-RHBZ-1544842.patch index f9e7fda..d78cf53 100644 --- a/SOURCES/0051-inspector-show-the-per-OS-osinfo-guess-RHBZ-1544842.patch +++ b/SOURCES/0051-inspector-show-the-per-OS-osinfo-guess-RHBZ-1544842.patch @@ -95,5 +95,5 @@ index 314785202..1e3a58af8 100644 -- -2.17.2 +2.20.1 diff --git a/SOURCES/0052-lib-libvirt-Convert-all-socket-parameters-to-an-abso.patch b/SOURCES/0052-lib-libvirt-Convert-all-socket-parameters-to-an-abso.patch index c2a9495..8f8d824 100644 --- a/SOURCES/0052-lib-libvirt-Convert-all-socket-parameters-to-an-abso.patch +++ b/SOURCES/0052-lib-libvirt-Convert-all-socket-parameters-to-an-abso.patch @@ -44,5 +44,5 @@ index c709c4fe2..4df26825a 100644 } } -- -2.17.2 +2.20.1 diff --git a/SOURCES/0053-v2v-o-rhv-upload-Optimize-http-request-sending.patch b/SOURCES/0053-v2v-o-rhv-upload-Optimize-http-request-sending.patch index 4c52732..6916be8 100644 --- a/SOURCES/0053-v2v-o-rhv-upload-Optimize-http-request-sending.patch +++ b/SOURCES/0053-v2v-o-rhv-upload-Optimize-http-request-sending.patch @@ -86,5 +86,5 @@ index b4557b83c..9ad354b84 100644 r = http.getresponse() if r.status != 200: -- -2.17.2 +2.20.1 diff --git a/SOURCES/0054-v2v-o-rhv-upload-Log-full-imageio-response-on-failur.patch b/SOURCES/0054-v2v-o-rhv-upload-Log-full-imageio-response-on-failur.patch index 25a49b5..4cc3683 100644 --- a/SOURCES/0054-v2v-o-rhv-upload-Log-full-imageio-response-on-failur.patch +++ b/SOURCES/0054-v2v-o-rhv-upload-Log-full-imageio-response-on-failur.patch @@ -149,5 +149,5 @@ index 9ad354b84..7c5084efd 100644 def delete_disk_on_failure(h): disk_service = h['disk_service'] -- -2.17.2 +2.20.1 diff --git a/SOURCES/0055-v2v-Add-Disk-ovf-capacity-attribute-containing-disk-.patch b/SOURCES/0055-v2v-Add-Disk-ovf-capacity-attribute-containing-disk-.patch index 79acb56..62a72d5 100644 --- a/SOURCES/0055-v2v-Add-Disk-ovf-capacity-attribute-containing-disk-.patch +++ b/SOURCES/0055-v2v-Add-Disk-ovf-capacity-attribute-containing-disk-.patch @@ -33,5 +33,5 @@ index ac3c61b13..e0f81e0a2 100644 "ovf:parentRef", ""; "ovf:vm_snapshot_id", uuidgen (); -- -2.17.2 +2.20.1 diff --git a/SOURCES/0056-v2v-File-ovf-size-changed-to-the-actual-size-if-know.patch b/SOURCES/0056-v2v-File-ovf-size-changed-to-the-actual-size-if-know.patch index 89359f4..30b71d0 100644 --- a/SOURCES/0056-v2v-File-ovf-size-changed-to-the-actual-size-if-know.patch +++ b/SOURCES/0056-v2v-File-ovf-size-changed-to-the-actual-size-if-know.patch @@ -37,5 +37,5 @@ index e0f81e0a2..9e0c772fd 100644 (* Add disk to DiskSection. *) -- -2.17.2 +2.20.1 diff --git a/SOURCES/0057-p2v-Allow-virt-v2v-input-and-output-drivers-containi.patch b/SOURCES/0057-p2v-Allow-virt-v2v-input-and-output-drivers-containi.patch index 1cb8bce..a4618fb 100644 --- a/SOURCES/0057-p2v-Allow-virt-v2v-input-and-output-drivers-containi.patch +++ b/SOURCES/0057-p2v-Allow-virt-v2v-input-and-output-drivers-containi.patch @@ -61,5 +61,5 @@ index 91b029b07..b7accc4f9 100644 let input_modules () = List.sort compare !input_modules and output_modules () = List.sort compare !output_modules -- -2.17.2 +2.20.1 diff --git a/SOURCES/0058-v2v-o-libvirt-Don-t-write-only-vendor-without-model-.patch b/SOURCES/0058-v2v-o-libvirt-Don-t-write-only-vendor-without-model-.patch index 16e6edb..1950087 100644 --- a/SOURCES/0058-v2v-o-libvirt-Don-t-write-only-vendor-without-model-.patch +++ b/SOURCES/0058-v2v-o-libvirt-Don-t-write-only-vendor-without-model-.patch @@ -44,5 +44,5 @@ index 582419f00..fbe90eeaa 100644 (match source.s_cpu_topology with | None -> () -- -2.17.2 +2.20.1 diff --git a/SOURCES/0059-v2v-rvh-upload-plugin-Always-read-the-response.patch b/SOURCES/0059-v2v-rvh-upload-plugin-Always-read-the-response.patch index bc7a2f8..63de496 100644 --- a/SOURCES/0059-v2v-rvh-upload-plugin-Always-read-the-response.patch +++ b/SOURCES/0059-v2v-rvh-upload-plugin-Always-read-the-response.patch @@ -108,5 +108,5 @@ index 7c5084efd..2eec375f7 100644 disk_service = h['disk_service'] disk_service.remove() -- -2.17.2 +2.20.1 diff --git a/SOURCES/0060-v2v-rhv-upload-plugin-Fix-name-error.patch b/SOURCES/0060-v2v-rhv-upload-plugin-Fix-name-error.patch index ac6b7ea..526a5d1 100644 --- a/SOURCES/0060-v2v-rhv-upload-plugin-Fix-name-error.patch +++ b/SOURCES/0060-v2v-rhv-upload-plugin-Fix-name-error.patch @@ -31,5 +31,5 @@ index 2eec375f7..10887c031 100644 # Since we've just created a new disk it's safe to ignore these # requests as long as they are smaller than the highest write seen. -- -2.17.2 +2.20.1 diff --git a/SOURCES/0061-v2v-rhv-upload-plugin-Remove-unused-variables.patch b/SOURCES/0061-v2v-rhv-upload-plugin-Remove-unused-variables.patch index fb63b70..38d4d12 100644 --- a/SOURCES/0061-v2v-rhv-upload-plugin-Remove-unused-variables.patch +++ b/SOURCES/0061-v2v-rhv-upload-plugin-Remove-unused-variables.patch @@ -48,5 +48,5 @@ index 10887c031..5c036c46a 100644 # Construct the JSON request for flushing. buf = json.dumps({'op': "flush"}).encode() -- -2.17.2 +2.20.1 diff --git a/SOURCES/0062-v2v-o-rhv-upload-Always-fetch-server-options-when-op.patch b/SOURCES/0062-v2v-o-rhv-upload-Always-fetch-server-options-when-op.patch index 205f315..28045c3 100644 --- a/SOURCES/0062-v2v-o-rhv-upload-Always-fetch-server-options-when-op.patch +++ b/SOURCES/0062-v2v-o-rhv-upload-Always-fetch-server-options-when-op.patch @@ -118,5 +118,5 @@ index 5c036c46a..f215eaecf 100644 def get_size(h): -- -2.17.2 +2.20.1 diff --git a/SOURCES/0063-v2v-o-rhv-upload-Use-Unix-domain-socket-to-access-im.patch b/SOURCES/0063-v2v-o-rhv-upload-Use-Unix-domain-socket-to-access-im.patch index ef637a4..c834783 100644 --- a/SOURCES/0063-v2v-o-rhv-upload-Use-Unix-domain-socket-to-access-im.patch +++ b/SOURCES/0063-v2v-o-rhv-upload-Use-Unix-domain-socket-to-access-im.patch @@ -137,5 +137,5 @@ index f215eaecf..8805e3552 100644 + self.sock.settimeout(timeout) + self.sock.connect(self.path) -- -2.17.2 +2.20.1 diff --git a/SOURCES/0064-v2v-improve-os-documentation-for-rhv-upload.patch b/SOURCES/0064-v2v-improve-os-documentation-for-rhv-upload.patch index c4d3d8d..09a5c32 100644 --- a/SOURCES/0064-v2v-improve-os-documentation-for-rhv-upload.patch +++ b/SOURCES/0064-v2v-improve-os-documentation-for-rhv-upload.patch @@ -25,5 +25,5 @@ index 806225be0..90443373f 100644 of the form ChostE:EpathE>, eg: -- -2.17.2 +2.20.1 diff --git a/SOURCES/0065-v2v-rhv-upload-plugin-Remove-unneeded-auth.patch b/SOURCES/0065-v2v-rhv-upload-plugin-Remove-unneeded-auth.patch index 79543ea..6205374 100644 --- a/SOURCES/0065-v2v-rhv-upload-plugin-Remove-unneeded-auth.patch +++ b/SOURCES/0065-v2v-rhv-upload-plugin-Remove-unneeded-auth.patch @@ -65,5 +65,5 @@ index 8805e3552..f404bd758 100644 http.putheader("Authorization", transfer.signed_ticket) http.putheader("Content-Range", -- -2.17.2 +2.20.1 diff --git a/SOURCES/0066-v2v-rhv-upload-plugin-Improve-error-handling.patch b/SOURCES/0066-v2v-rhv-upload-plugin-Improve-error-handling.patch index 07df2e0..01c9ec5 100644 --- a/SOURCES/0066-v2v-rhv-upload-plugin-Improve-error-handling.patch +++ b/SOURCES/0066-v2v-rhv-upload-plugin-Improve-error-handling.patch @@ -62,5 +62,5 @@ index f404bd758..8e4052048 100644 # Save everything we need to make requests in the handle. return { -- -2.17.2 +2.20.1 diff --git a/SOURCES/0067-v2v-rhv-upload-plugin-Optimize-only-direct-upload.patch b/SOURCES/0067-v2v-rhv-upload-plugin-Optimize-only-direct-upload.patch index afc2aae..f8655fe 100644 --- a/SOURCES/0067-v2v-rhv-upload-plugin-Optimize-only-direct-upload.patch +++ b/SOURCES/0067-v2v-rhv-upload-plugin-Optimize-only-direct-upload.patch @@ -28,5 +28,5 @@ index 8e4052048..da309e288 100644 types.ImageTransfer( disk = types.Disk(id = disk.id), -- -2.17.2 +2.20.1 diff --git a/SOURCES/0068-v2v-rhv-plugin-find-suitable-host-RHBZ-1596810-RHBZ-.patch b/SOURCES/0068-v2v-rhv-plugin-find-suitable-host-RHBZ-1596810-RHBZ-.patch index 0b45e56..5ae34a0 100644 --- a/SOURCES/0068-v2v-rhv-plugin-find-suitable-host-RHBZ-1596810-RHBZ-.patch +++ b/SOURCES/0068-v2v-rhv-plugin-find-suitable-host-RHBZ-1596810-RHBZ-.patch @@ -57,5 +57,5 @@ index da309e288..931fcfaa2 100644 host = hosts[0] -- -2.17.2 +2.20.1 diff --git a/SOURCES/0069-v2v-change-QXL-ResourceType-in-OVirt-flavour-RHBZ-15.patch b/SOURCES/0069-v2v-change-QXL-ResourceType-in-OVirt-flavour-RHBZ-15.patch index 1f004b4..e432b78 100644 --- a/SOURCES/0069-v2v-change-QXL-ResourceType-in-OVirt-flavour-RHBZ-15.patch +++ b/SOURCES/0069-v2v-change-QXL-ResourceType-in-OVirt-flavour-RHBZ-15.patch @@ -37,5 +37,5 @@ index 9e0c772fd..5db239d66 100644 e "rasd:VirtualQuantity" [] [PCData "1"]; e "rasd:Device" [] [PCData "qxl"]; -- -2.17.2 +2.20.1 diff --git a/SOURCES/0070-v2v-o-rhv-upload-check-for-ovirtsdk4-RHBZ-1601943.patch b/SOURCES/0070-v2v-o-rhv-upload-check-for-ovirtsdk4-RHBZ-1601943.patch index dec50c8..8d1cf8a 100644 --- a/SOURCES/0070-v2v-o-rhv-upload-check-for-ovirtsdk4-RHBZ-1601943.patch +++ b/SOURCES/0070-v2v-o-rhv-upload-check-for-ovirtsdk4-RHBZ-1601943.patch @@ -36,5 +36,5 @@ index 0152b8d5a..63fa2411a 100644 error_unless_nbdkit_python3_working (); error_unless_output_alloc_sparse (); -- -2.17.2 +2.20.1 diff --git a/SOURCES/0071-v2v-rhv-plugin-fix-DC-search-string.patch b/SOURCES/0071-v2v-rhv-plugin-fix-DC-search-string.patch index a467fd7..03f6537 100644 --- a/SOURCES/0071-v2v-rhv-plugin-fix-DC-search-string.patch +++ b/SOURCES/0071-v2v-rhv-plugin-fix-DC-search-string.patch @@ -25,5 +25,5 @@ index 931fcfaa2..8274f1ee1 100644 ) if len(data_centers) == 0: -- -2.17.2 +2.20.1 diff --git a/SOURCES/0072-v2v-rhv-plugin-case-sensitive-search-queries.patch b/SOURCES/0072-v2v-rhv-plugin-case-sensitive-search-queries.patch index 86520e9..a7691d8 100644 --- a/SOURCES/0072-v2v-rhv-plugin-case-sensitive-search-queries.patch +++ b/SOURCES/0072-v2v-rhv-plugin-case-sensitive-search-queries.patch @@ -31,5 +31,5 @@ index 8274f1ee1..4fad27fb8 100644 if len(hosts) == 0: # Couldn't find a host that's fulfilling the following criteria: -- -2.17.2 +2.20.1 diff --git a/SOURCES/0073-Revert-lvm-do-not-pass-cache-to-vgscan.patch b/SOURCES/0073-Revert-lvm-do-not-pass-cache-to-vgscan.patch index 9b8a2e8..3ae17f0 100644 --- a/SOURCES/0073-Revert-lvm-do-not-pass-cache-to-vgscan.patch +++ b/SOURCES/0073-Revert-lvm-do-not-pass-cache-to-vgscan.patch @@ -36,5 +36,5 @@ index 877bc5f6c..709a1e73b 100644 reply_with_error ("%s", err); return -1; -- -2.17.2 +2.20.1 diff --git a/SOURCES/0074-daemon-inspect-ignore-fstab-devs-that-cannot-be-reso.patch b/SOURCES/0074-daemon-inspect-ignore-fstab-devs-that-cannot-be-reso.patch index f8000e5..6311096 100644 --- a/SOURCES/0074-daemon-inspect-ignore-fstab-devs-that-cannot-be-reso.patch +++ b/SOURCES/0074-daemon-inspect-ignore-fstab-devs-that-cannot-be-reso.patch @@ -42,5 +42,5 @@ index edb797e3f..170440d2c 100644 (* Resolve /dev/root to the current device. * Do the same for the / partition of the *BSD -- -2.17.2 +2.20.1 diff --git a/SOURCES/0075-v2v-parse_libvirt_xml-handle-srN-CDROM-devices-RHBZ-.patch b/SOURCES/0075-v2v-parse_libvirt_xml-handle-srN-CDROM-devices-RHBZ-.patch index 1f59921..4d35012 100644 --- a/SOURCES/0075-v2v-parse_libvirt_xml-handle-srN-CDROM-devices-RHBZ-.patch +++ b/SOURCES/0075-v2v-parse_libvirt_xml-handle-srN-CDROM-devices-RHBZ-.patch @@ -32,5 +32,5 @@ index 57e741574..4912f1cc0 100644 let rec loop = function | [] -> -- -2.17.2 +2.20.1 diff --git a/SOURCES/0076-v2v-o-rhv-upload-Fix-error-message-disk-numbering-RH.patch b/SOURCES/0076-v2v-o-rhv-upload-Fix-error-message-disk-numbering-RH.patch index 059ae16..581b518 100644 --- a/SOURCES/0076-v2v-o-rhv-upload-Fix-error-message-disk-numbering-RH.patch +++ b/SOURCES/0076-v2v-o-rhv-upload-Fix-error-message-disk-numbering-RH.patch @@ -38,5 +38,5 @@ index 63fa2411a..7dbd98a0d 100644 diskid ) targets in -- -2.17.2 +2.20.1 diff --git a/SOURCES/0077-v2v-o-rhv-upload-Properly-replace-SD_UUID-in-OVF-RHB.patch b/SOURCES/0077-v2v-o-rhv-upload-Properly-replace-SD_UUID-in-OVF-RHB.patch index 00557e9..2d0697b 100644 --- a/SOURCES/0077-v2v-o-rhv-upload-Properly-replace-SD_UUID-in-OVF-RHB.patch +++ b/SOURCES/0077-v2v-o-rhv-upload-Properly-replace-SD_UUID-in-OVF-RHB.patch @@ -25,5 +25,5 @@ index a34627ec8..1d0e8c95d 100644 vms_service = system_service.vms_service() vm = vms_service.add( -- -2.17.2 +2.20.1 diff --git a/SOURCES/0078-ppc64le-Don-t-use-cpu-parameter-under-any-circumstan.patch b/SOURCES/0078-ppc64le-Don-t-use-cpu-parameter-under-any-circumstan.patch index 15c6f6c..537960c 100644 --- a/SOURCES/0078-ppc64le-Don-t-use-cpu-parameter-under-any-circumstan.patch +++ b/SOURCES/0078-ppc64le-Don-t-use-cpu-parameter-under-any-circumstan.patch @@ -23,5 +23,5 @@ index a6c1b0faf..fa1bae3f9 100644 /* On most architectures, it is faster to pass the CPU host model to * the appliance, allowing maximum speed for things like checksums -- -2.17.2 +2.20.1 diff --git a/SOURCES/0079-RHEL-7-v2v-rhv-upload-Remove-restriction-on-oa-spars.patch b/SOURCES/0079-RHEL-7-v2v-rhv-upload-Remove-restriction-on-oa-spars.patch index a366d3a..4b1b2a5 100644 --- a/SOURCES/0079-RHEL-7-v2v-rhv-upload-Remove-restriction-on-oa-spars.patch +++ b/SOURCES/0079-RHEL-7-v2v-rhv-upload-Remove-restriction-on-oa-spars.patch @@ -78,5 +78,5 @@ index 90443373f..91f575617 100644 A file containing a password to be used when connecting to the oVirt -- -2.17.2 +2.20.1 diff --git a/SOURCES/0080-RHEL-7-o-rhv-upload-Use-Python-2-instead-of-Python-3.patch b/SOURCES/0080-RHEL-7-o-rhv-upload-Use-Python-2-instead-of-Python-3.patch index d76d822..a77ebba 100644 --- a/SOURCES/0080-RHEL-7-o-rhv-upload-Use-Python-2-instead-of-Python-3.patch +++ b/SOURCES/0080-RHEL-7-o-rhv-upload-Use-Python-2-instead-of-Python-3.patch @@ -312,5 +312,5 @@ index b167f4610..8d5924e3c 100755 # Checks the files are syntactically correct, but not very much else. for f in $files; do -- -2.17.2 +2.20.1 diff --git a/SOURCES/0081-RHEL-7-v2v-rhv-upload-Disable-Nagle-algorithm.patch b/SOURCES/0081-RHEL-7-v2v-rhv-upload-Disable-Nagle-algorithm.patch index 97f4751..ac5e083 100644 --- a/SOURCES/0081-RHEL-7-v2v-rhv-upload-Disable-Nagle-algorithm.patch +++ b/SOURCES/0081-RHEL-7-v2v-rhv-upload-Disable-Nagle-algorithm.patch @@ -71,5 +71,5 @@ index 3d4ed1270..b262fb3d6 100644 global params -- -2.17.2 +2.20.1 diff --git a/SOURCES/0082-RHEL-7-p2v-ignore-rhv-upload-driver-RHBZ-1590220.patch b/SOURCES/0082-RHEL-7-p2v-ignore-rhv-upload-driver-RHBZ-1590220.patch index f9c2c86..8a45f8b 100644 --- a/SOURCES/0082-RHEL-7-p2v-ignore-rhv-upload-driver-RHBZ-1590220.patch +++ b/SOURCES/0082-RHEL-7-p2v-ignore-rhv-upload-driver-RHBZ-1590220.patch @@ -29,5 +29,5 @@ index 15f53b692..654121a22 100644 } -- -2.17.2 +2.20.1 diff --git a/SOURCES/0083-v2v-docs-Describe-support-for-SHA-2-certs-for-Window.patch b/SOURCES/0083-v2v-docs-Describe-support-for-SHA-2-certs-for-Window.patch index a128b11..2b9802b 100644 --- a/SOURCES/0083-v2v-docs-Describe-support-for-SHA-2-certs-for-Window.patch +++ b/SOURCES/0083-v2v-docs-Describe-support-for-SHA-2-certs-for-Window.patch @@ -36,5 +36,5 @@ index 91f575617..457effa50 100644 VMware allows you to present UEFI firmware to guests (instead of the -- -2.17.2 +2.20.1 diff --git a/SOURCES/0084-v2v-windows-Fix-rhev-apt-command-line-RHBZ-1624902.patch b/SOURCES/0084-v2v-windows-Fix-rhev-apt-command-line-RHBZ-1624902.patch index 1f104af..6de787c 100644 --- a/SOURCES/0084-v2v-windows-Fix-rhev-apt-command-line-RHBZ-1624902.patch +++ b/SOURCES/0084-v2v-windows-Fix-rhev-apt-command-line-RHBZ-1624902.patch @@ -33,5 +33,5 @@ index 163319545..4f0a08248 100644 echo starting rhev-apt net start rhev-apt -- -2.17.2 +2.20.1 diff --git a/SOURCES/0085-inspect-fix-inspection-of-partition-less-devices-RHB.patch b/SOURCES/0085-inspect-fix-inspection-of-partition-less-devices-RHB.patch new file mode 100644 index 0000000..f3f8c3a --- /dev/null +++ b/SOURCES/0085-inspect-fix-inspection-of-partition-less-devices-RHB.patch @@ -0,0 +1,52 @@ +From e360577d64cd598d61d4d8696333ce1e1ca3bf17 Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Mon, 14 Jan 2019 17:07:45 +0100 +Subject: [PATCH] inspect: fix inspection of partition-less devices + (RHBZ#1661038) + +When parsing "xdev"-kind devices, do not assume that the partition +number can be converted to integer: re_xdev accepts an empty part of the +partition number, so just handle as it is, as string. + +This fixes a regression due to the conversion of the inspection code to +OCaml, as the old C version did not have this issue. + +(cherry picked from commit cf6b527824b2a8dc6e8bc65e38ebdceb227e6db1) +--- + daemon/inspect_fs_unix_fstab.ml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/daemon/inspect_fs_unix_fstab.ml b/daemon/inspect_fs_unix_fstab.ml +index 170440d2c..3428ad75c 100644 +--- a/daemon/inspect_fs_unix_fstab.ml ++++ b/daemon/inspect_fs_unix_fstab.ml +@@ -347,7 +347,7 @@ and resolve_fstab_device spec md_map os_type = + debug_matching "xdev"; + let typ = PCRE.sub 1 + and disk = PCRE.sub 2 +- and part = int_of_string (PCRE.sub 3) in ++ and part = PCRE.sub 3 in + resolve_xdev typ disk part default + ) + +@@ -464,7 +464,7 @@ and resolve_fstab_device spec md_map os_type = + debug_matching "Hurd"; + let typ = PCRE.sub 1 + and disk = int_of_string (PCRE.sub 2) +- and part = int_of_string (PCRE.sub 3) in ++ and part = PCRE.sub 3 in + + (* Hurd disk devices are like /dev/hdNsM, where hdN is the + * N-th disk and M is the M-th partition on that disk. +@@ -501,7 +501,7 @@ and resolve_xdev typ disk part default = + let i = drive_index disk in + if i >= 0 && i < Array.length devices then ( + let dev = Array.get devices i in +- let dev = dev ^ string_of_int part in ++ let dev = dev ^ part in + if is_partition dev then + Mountable.of_device dev + else +-- +2.20.1 + diff --git a/SPECS/libguestfs.spec b/SPECS/libguestfs.spec index 010667b..0db8fb2 100644 --- a/SPECS/libguestfs.spec +++ b/SPECS/libguestfs.spec @@ -21,7 +21,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.38.2 -Release: 12%{?dist}.1 +Release: 12%{?dist}.2 License: LGPLv2+ # Source and patches. @@ -124,6 +124,7 @@ Patch0081: 0081-RHEL-7-v2v-rhv-upload-Disable-Nagle-algorithm.patch Patch0082: 0082-RHEL-7-p2v-ignore-rhv-upload-driver-RHBZ-1590220.patch Patch0083: 0083-v2v-docs-Describe-support-for-SHA-2-certs-for-Window.patch Patch0084: 0084-v2v-windows-Fix-rhev-apt-command-line-RHBZ-1624902.patch +Patch0085: 0085-inspect-fix-inspection-of-partition-less-devices-RHB.patch # Use git for patch management. BuildRequires: git @@ -1333,6 +1334,10 @@ install -m 0644 utils/boot-benchmark/boot-benchmark.1 $RPM_BUILD_ROOT%{_mandir}/ %changelog +* Thu Feb 07 2019 Pino Toscano - 1:1.38.2-12.el7_6.2 +- Fix inspection of partition-less devices + resolves: rhbz#1673280 + * Fri Oct 12 2018 Pino Toscano - 1:1.38.2-12.el7_6.1 - v2v: update documentation regarding SHA-2 certificates in Windows 7 and Windows Server 2008 R2