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 30b854e..24af4ae 100644 --- a/SOURCES/0001-RHEL-7-Remove-libguestfs-live-RHBZ-798980.patch +++ b/SOURCES/0001-RHEL-7-Remove-libguestfs-live-RHBZ-798980.patch @@ -9,7 +9,7 @@ This isn't supported in RHEL 7. 1 file changed, 7 insertions(+) diff --git a/lib/launch-unix.c b/lib/launch-unix.c -index 8ce4ca5..9be2b9c 100644 +index 8ce4ca5b4..9be2b9c5f 100644 --- a/lib/launch-unix.c +++ b/lib/launch-unix.c @@ -37,6 +37,12 @@ @@ -34,5 +34,5 @@ index 8ce4ca5..9be2b9c 100644 static int -- -2.9.4 +2.13.4 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 62a0362..6e565ff 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 @@ -16,7 +16,7 @@ Subject: [PATCH] RHEL 7: Remove 9p APIs from RHEL (RHBZ#921710). delete mode 100644 daemon/9p.c diff --git a/Makefile.am b/Makefile.am -index 12486de..14b277a 100644 +index 12486deee..14b277a35 100644 --- a/Makefile.am +++ b/Makefile.am @@ -73,7 +73,7 @@ SUBDIRS += tests/xfs @@ -30,7 +30,7 @@ index 12486de..14b277a 100644 SUBDIRS += tests/disk-labels diff --git a/daemon/9p.c b/daemon/9p.c deleted file mode 100644 -index bd564a5..0000000 +index bd564a5be..000000000 --- a/daemon/9p.c +++ /dev/null @@ -1,225 +0,0 @@ @@ -260,7 +260,7 @@ index bd564a5..0000000 - return 0; -} diff --git a/daemon/Makefile.am b/daemon/Makefile.am -index 9381742..0670cda 100644 +index 9381742c8..0670cda90 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -48,7 +48,6 @@ endif @@ -272,7 +272,7 @@ index 9381742..0670cda 100644 actions.h \ available.c \ diff --git a/docs/C_SOURCE_FILES b/docs/C_SOURCE_FILES -index 26abcc9..608eaea 100644 +index 26abcc9bb..608eaea76 100644 --- a/docs/C_SOURCE_FILES +++ b/docs/C_SOURCE_FILES @@ -49,7 +49,6 @@ common/windows/windows.h @@ -284,7 +284,7 @@ index 26abcc9..608eaea 100644 daemon/actions.h daemon/augeas.c diff --git a/generator/actions_core.ml b/generator/actions_core.ml -index ed89f74..2567981 100644 +index ed89f74aa..2567981d7 100644 --- a/generator/actions_core.ml +++ b/generator/actions_core.ml @@ -6372,27 +6372,6 @@ This returns true iff the device exists and contains all zero bytes. @@ -316,7 +316,7 @@ index ed89f74..2567981 100644 style = RStringList "devices", [], []; shortdesc = "list device mapper devices"; diff --git a/generator/proc_nr.ml b/generator/proc_nr.ml -index b3be319..7f92e04 100644 +index b3be31996..7f92e0427 100644 --- a/generator/proc_nr.ml +++ b/generator/proc_nr.ml @@ -295,8 +295,6 @@ let proc_nr = [ @@ -329,7 +329,7 @@ index b3be319..7f92e04 100644 288, "ntfsresize"; 289, "btrfs_filesystem_resize"; diff --git a/gobject/Makefile.inc b/gobject/Makefile.inc -index 8fa8599..7a52726 100644 +index 8fa8599d3..7a5272684 100644 --- a/gobject/Makefile.inc +++ b/gobject/Makefile.inc @@ -92,7 +92,6 @@ guestfs_gobject_headers= \ @@ -349,7 +349,7 @@ index 8fa8599..7a52726 100644 src/optargs-ntfsclone_out.c \ src/optargs-ntfsfix.c \ diff --git a/po/POTFILES b/po/POTFILES -index 904e751..143d1cd 100644 +index 904e751de..143d1cd9d 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -39,7 +39,6 @@ customize/crypt-c.c @@ -369,5 +369,5 @@ index 904e751..143d1cd 100644 gobject/src/optargs-ntfsclone_out.c gobject/src/optargs-ntfsfix.c -- -2.9.4 +2.13.4 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 efc13f1..26bb7ee 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 @@ -33,7 +33,7 @@ In RHEL 7.2: rbd (Ceph) support was enabled. 8 files changed, 15 insertions(+), 347 deletions(-) diff --git a/docs/guestfs-testing.pod b/docs/guestfs-testing.pod -index 1e88ed4..ce64755 100644 +index 1e88ed4df..ce64755db 100644 --- a/docs/guestfs-testing.pod +++ b/docs/guestfs-testing.pod @@ -113,26 +113,6 @@ image. To exit, type C. @@ -64,7 +64,7 @@ index 1e88ed4..ce64755 100644 Run L on guests or disk images: diff --git a/fish/guestfish.pod b/fish/guestfish.pod -index 3b71c3a..cbaaca5 100644 +index 3b71c3a21..cbaaca516 100644 --- a/fish/guestfish.pod +++ b/fish/guestfish.pod @@ -131,9 +131,9 @@ To list what is available do: @@ -165,7 +165,7 @@ index 3b71c3a..cbaaca5 100644 Some (not all) long-running commands send progress notification diff --git a/fish/test-add-uri.sh b/fish/test-add-uri.sh -index 756df99..8f84fd3 100755 +index 756df997b..8f84fd31b 100755 --- a/fish/test-add-uri.sh +++ b/fish/test-add-uri.sh @@ -40,14 +40,6 @@ function fail () @@ -214,7 +214,7 @@ index 756df99..8f84fd3 100755 rm test-add-uri.out rm test-add-uri.img diff --git a/generator/actions_core.ml b/generator/actions_core.ml -index 2567981..e4b2b8c 100644 +index 2567981d7..e4b2b8c4c 100644 --- a/generator/actions_core.ml +++ b/generator/actions_core.ml @@ -522,29 +522,6 @@ F is interpreted as a local file or device. @@ -299,7 +299,7 @@ index 2567981..e4b2b8c 100644 example if using the libvirt backend and if the libvirt backend is configured to start the qemu appliance as a special user such as C. If in doubt, diff --git a/lib/drives.c b/lib/drives.c -index 4cf41cd..2d86ca8 100644 +index 4cf41cd9b..2d86ca88a 100644 --- a/lib/drives.c +++ b/lib/drives.c @@ -165,6 +165,7 @@ create_drive_non_file (guestfs_h *g, @@ -367,7 +367,7 @@ index 4cf41cd..2d86ca8 100644 error (g, _("unknown protocol '%s'"), protocol); drv = NULL; /*FALLTHROUGH*/ diff --git a/lib/guestfs.pod b/lib/guestfs.pod -index e02cda6..41aa7ad 100644 +index e02cda6f8..41aa7ad83 100644 --- a/lib/guestfs.pod +++ b/lib/guestfs.pod @@ -714,70 +714,6 @@ servers. The server string is documented in @@ -485,7 +485,7 @@ index e02cda6..41aa7ad 100644 Libguestfs has APIs for inspecting an unknown disk image to find out diff --git a/tests/disks/test-qemu-drive-libvirt.sh b/tests/disks/test-qemu-drive-libvirt.sh -index a1a7b89..aefd7cb 100755 +index a1a7b8906..aefd7cb4a 100755 --- a/tests/disks/test-qemu-drive-libvirt.sh +++ b/tests/disks/test-qemu-drive-libvirt.sh @@ -64,34 +64,6 @@ check_output @@ -524,7 +524,7 @@ index a1a7b89..aefd7cb 100755 $guestfish -d pool1 run ||: diff --git a/tests/disks/test-qemu-drive.sh b/tests/disks/test-qemu-drive.sh -index 19dd60a..583e031 100755 +index 19dd60a2f..583e031bd 100755 --- a/tests/disks/test-qemu-drive.sh +++ b/tests/disks/test-qemu-drive.sh @@ -62,45 +62,6 @@ check_output @@ -599,5 +599,5 @@ index 19dd60a..583e031 100755 -grep -sq -- '-drive file=ssh://rich@example.com/disk.img,' "$DEBUG_QEMU_FILE" || fail -rm "$DEBUG_QEMU_FILE" -- -2.9.4 +2.13.4 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 09bf067..4560d5a 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 @@ -9,7 +9,7 @@ This isn't supported in RHEL 7. 1 file changed, 13 insertions(+) diff --git a/lib/launch-uml.c b/lib/launch-uml.c -index c391af3..3033daa 100644 +index c391af309..3033daa88 100644 --- a/lib/launch-uml.c +++ b/lib/launch-uml.c @@ -44,7 +44,9 @@ struct backend_uml_data { @@ -68,5 +68,5 @@ index c391af3..3033daa 100644 static int shutdown_uml (guestfs_h *g, void *datav, int check_for_errors) -- -2.9.4 +2.13.4 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 0481f61..f339a3e 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 @@ -16,7 +16,7 @@ support cases. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v2v/qemu_command.ml b/v2v/qemu_command.ml -index ccdda8a..19757e0 100644 +index ccdda8ad4..19757e007 100644 --- a/v2v/qemu_command.ml +++ b/v2v/qemu_command.ml @@ -32,7 +32,7 @@ and arg = @@ -29,5 +29,5 @@ index ccdda8a..19757e0 100644 let flag t k = assert (String.is_prefix k "-"); -- -2.9.4 +2.13.4 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 d2f5dc3..d569485 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 @@ -14,7 +14,7 @@ qemu script. 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml -index c294e57..9f02098 100644 +index c294e5778..9f02098c0 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -199,7 +199,6 @@ let parse_cmdline () = @@ -35,7 +35,7 @@ index c294e57..9f02098 100644 output_format, output_alloc diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod -index 838b598..79c742e 100644 +index 838b5986f..79c742e3f 100644 --- a/v2v/virt-v2v.pod +++ b/v2v/virt-v2v.pod @@ -145,11 +145,6 @@ Since F contains the path(s) to the guest disk @@ -73,5 +73,5 @@ index 838b598..79c742e 100644 =item B<--quiet> -- -2.9.4 +2.13.4 diff --git a/SOURCES/0007-RHEL-7-Revert-tests-rsync-Skip-this-test-when-the-ba.patch b/SOURCES/0007-RHEL-7-Revert-tests-rsync-Skip-this-test-when-the-ba.patch index 1a74e54..f43ed77 100644 --- a/SOURCES/0007-RHEL-7-Revert-tests-rsync-Skip-this-test-when-the-ba.patch +++ b/SOURCES/0007-RHEL-7-Revert-tests-rsync-Skip-this-test-when-the-ba.patch @@ -10,7 +10,7 @@ This reverts commit 765dc6237ce7b93dd2f33d99be53eae92e048a7a. 1 file changed, 7 insertions(+), 28 deletions(-) diff --git a/tests/rsync/test-rsync.sh b/tests/rsync/test-rsync.sh -index c6d98cf..2463962 100755 +index c6d98cfd1..246396276 100755 --- a/tests/rsync/test-rsync.sh +++ b/tests/rsync/test-rsync.sh @@ -26,33 +26,10 @@ skip_if_skipped @@ -70,5 +70,5 @@ index c6d98cf..2463962 100755 guestfish --network -N test-rsync.img=fs -m /dev/sda1 < for the C file @@ -32,7 +32,7 @@ index 41aa7ad..6443e3b 100644 I This is B and has a tendency to eat diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c -index 168bba6..bc5d4d2 100644 +index 168bba6ac..bc5d4d215 100644 --- a/lib/launch-libvirt.c +++ b/lib/launch-libvirt.c @@ -115,7 +115,6 @@ struct backend_libvirt_data { @@ -115,5 +115,5 @@ index 168bba6..bc5d4d2 100644 free (data->secrets[i].secret); free (data->secrets); -- -2.9.4 +2.13.4 diff --git a/SOURCES/0010-RHEL-7-Revert-launch-libvirt-Better-error-when-bridg.patch b/SOURCES/0010-RHEL-7-Revert-launch-libvirt-Better-error-when-bridg.patch index 9176533..66b876a 100644 --- a/SOURCES/0010-RHEL-7-Revert-launch-libvirt-Better-error-when-bridg.patch +++ b/SOURCES/0010-RHEL-7-Revert-launch-libvirt-Better-error-when-bridg.patch @@ -10,7 +10,7 @@ This reverts commit edcd02a965ae6675c0ee9ecd8d98a1a641c6ef60. 1 file changed, 47 deletions(-) diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c -index bc5d4d2..0c2879d 100644 +index bc5d4d215..0c2879dbf 100644 --- a/lib/launch-libvirt.c +++ b/lib/launch-libvirt.c @@ -155,7 +155,6 @@ static int is_blk (const char *path); @@ -82,5 +82,5 @@ index bc5d4d2..0c2879d 100644 ignore_errors (void *ignore, virErrorPtr ignore2) { -- -2.9.4 +2.13.4 diff --git a/SOURCES/0011-RHEL-7-Revert-appliance-add-dhcp-client-on-Mageia.patch b/SOURCES/0011-RHEL-7-Revert-appliance-add-dhcp-client-on-Mageia.patch index fb9c9d3..c41dea0 100644 --- a/SOURCES/0011-RHEL-7-Revert-appliance-add-dhcp-client-on-Mageia.patch +++ b/SOURCES/0011-RHEL-7-Revert-appliance-add-dhcp-client-on-Mageia.patch @@ -9,7 +9,7 @@ This reverts commit 8f3a2ca5358d5601be7a9247b6d08193c4e2da46. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appliance/packagelist.in b/appliance/packagelist.in -index 8ed3afe..0477bfc 100644 +index 8ed3afedc..0477bfc55 100644 --- a/appliance/packagelist.in +++ b/appliance/packagelist.in @@ -188,7 +188,7 @@ ifelse(MAGEIA,1, @@ -22,5 +22,5 @@ index 8ed3afe..0477bfc 100644 gfs2-utils grub -- -2.9.4 +2.13.4 diff --git a/SOURCES/0012-RHEL-7-Revert-appliance-add-dhcpcd-and-gptfdisk-on-A.patch b/SOURCES/0012-RHEL-7-Revert-appliance-add-dhcpcd-and-gptfdisk-on-A.patch index 61105e3..9445d49 100644 --- a/SOURCES/0012-RHEL-7-Revert-appliance-add-dhcpcd-and-gptfdisk-on-A.patch +++ b/SOURCES/0012-RHEL-7-Revert-appliance-add-dhcpcd-and-gptfdisk-on-A.patch @@ -10,7 +10,7 @@ This reverts commit 979e7a49147f4ef1387337db262bf7ea12f627e3. 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/appliance/packagelist.in b/appliance/packagelist.in -index 0477bfc..961a2a3 100644 +index 0477bfc55..961a2a3b1 100644 --- a/appliance/packagelist.in +++ b/appliance/packagelist.in @@ -105,8 +105,7 @@ ifelse(ARCHLINUX,1, @@ -24,5 +24,5 @@ index 0477bfc..961a2a3 100644 hivex iproute2 -- -2.9.4 +2.13.4 diff --git a/SOURCES/0013-RHEL-7-Revert-appliance-Use-dhclient-or-dhcpcd-inste.patch b/SOURCES/0013-RHEL-7-Revert-appliance-Use-dhclient-or-dhcpcd-inste.patch index b010896..e378ecd 100644 --- a/SOURCES/0013-RHEL-7-Revert-appliance-Use-dhclient-or-dhcpcd-inste.patch +++ b/SOURCES/0013-RHEL-7-Revert-appliance-Use-dhclient-or-dhcpcd-inste.patch @@ -11,7 +11,7 @@ This reverts commit 67e6f32a240c7c234e6af637c1cd324b36a82cd3. 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/appliance/init b/appliance/init -index 624e20f..2e18be4 100755 +index 624e20fa6..2e18be4fe 100755 --- a/appliance/init +++ b/appliance/init @@ -118,15 +118,12 @@ shopt -u nullglob @@ -37,7 +37,7 @@ index 624e20f..2e18be4 100755 # Scan for MDs. mdadm -As --auto=yes --run diff --git a/appliance/packagelist.in b/appliance/packagelist.in -index 961a2a3..b437b02 100644 +index 961a2a3b1..b437b02e0 100644 --- a/appliance/packagelist.in +++ b/appliance/packagelist.in @@ -26,7 +26,6 @@ ifelse(REDHAT,1, @@ -90,5 +90,5 @@ index 961a2a3..b437b02 100644 gfs2-utils grub -- -2.9.4 +2.13.4 diff --git a/SOURCES/0014-RHEL-7-Disable-alternate-Augeas-lenses.patch b/SOURCES/0014-RHEL-7-Disable-alternate-Augeas-lenses.patch index 60d4c93..f19674b 100644 --- a/SOURCES/0014-RHEL-7-Disable-alternate-Augeas-lenses.patch +++ b/SOURCES/0014-RHEL-7-Disable-alternate-Augeas-lenses.patch @@ -15,7 +15,7 @@ https://www.redhat.com/archives/libguestfs/2014-October/msg00220.html 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/appliance/Makefile.am b/appliance/Makefile.am -index 05b9d42..1e142cb 100644 +index 05b9d42e9..1e142cbd0 100644 --- a/appliance/Makefile.am +++ b/appliance/Makefile.am @@ -92,8 +92,6 @@ supermin.d/daemon.tar.gz: ../daemon/guestfsd guestfs_lvm_conf.aug guestfs_shadow @@ -28,7 +28,7 @@ index 05b9d42..1e142cb 100644 rm -r tmp-d mv $@-t $@ diff --git a/daemon/augeas.c b/daemon/augeas.c -index 5adc959..dc5266e 100644 +index 5adc959a5..dc5266ee4 100644 --- a/daemon/augeas.c +++ b/daemon/augeas.c @@ -134,7 +134,7 @@ do_aug_init (const char *root, int flags) @@ -58,7 +58,7 @@ index 5adc959..dc5266e 100644 return 0; } diff --git a/daemon/lvm-filter.c b/daemon/lvm-filter.c -index 5c9ce18..bd32626 100644 +index 5c9ce1866..bd32626e6 100644 --- a/daemon/lvm-filter.c +++ b/daemon/lvm-filter.c @@ -140,7 +140,7 @@ set_filter (char *const *filters) @@ -80,5 +80,5 @@ index 5c9ce18..bd32626 100644 if (r == -1) { AUGEAS_ERROR ("aug_transform"); -- -2.9.4 +2.13.4 diff --git a/SOURCES/0015-RHEL-7-Fix-list-of-supported-sound-cards-to-match-RH.patch b/SOURCES/0015-RHEL-7-Fix-list-of-supported-sound-cards-to-match-RH.patch index 9d3b2e1..9ef5daf 100644 --- a/SOURCES/0015-RHEL-7-Fix-list-of-supported-sound-cards-to-match-RH.patch +++ b/SOURCES/0015-RHEL-7-Fix-list-of-supported-sound-cards-to-match-RH.patch @@ -9,7 +9,7 @@ Subject: [PATCH] RHEL 7: Fix list of supported sound cards to match RHEL qemu 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/v2v/utils.ml b/v2v/utils.ml -index e53f9fe..8f1053e 100644 +index e53f9fe0a..8f1053ec9 100644 --- a/v2v/utils.ml +++ b/v2v/utils.ml @@ -40,13 +40,14 @@ let kvm_arch = function @@ -30,5 +30,5 @@ index e53f9fe..8f1053e 100644 (* Find the UEFI firmware. *) let find_uefi_firmware guest_arch = -- -2.9.4 +2.13.4 diff --git a/SOURCES/0016-RHEL-7-v2v-efi-Remove-references-to-Fedora-kraxel-s-.patch b/SOURCES/0016-RHEL-7-v2v-efi-Remove-references-to-Fedora-kraxel-s-.patch index 563ccdf..930b2a5 100644 --- a/SOURCES/0016-RHEL-7-v2v-efi-Remove-references-to-Fedora-kraxel-s-.patch +++ b/SOURCES/0016-RHEL-7-v2v-efi-Remove-references-to-Fedora-kraxel-s-.patch @@ -10,7 +10,7 @@ Subject: [PATCH] RHEL 7: v2v: efi: Remove references to Fedora / kraxel's OVMF 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/generator/UEFI.ml b/generator/UEFI.ml -index 95797aa..881009c 100644 +index 95797aad9..881009cfb 100644 --- a/generator/UEFI.ml +++ b/generator/UEFI.ml @@ -30,12 +30,6 @@ open Docstrings @@ -27,7 +27,7 @@ index 95797aa..881009c 100644 "/usr/share/OVMF/OVMF_CODE.fd", None, diff --git a/v2v/utils.ml b/v2v/utils.ml -index 8f1053e..212c8a0 100644 +index 8f1053ec9..212c8a0a0 100644 --- a/v2v/utils.ml +++ b/v2v/utils.ml @@ -54,7 +54,6 @@ let find_uefi_firmware guest_arch = @@ -48,5 +48,5 @@ index 8f1053e..212c8a0 100644 if Sys.file_exists code && Sys.file_exists vars_template then ret else loop rest -- -2.9.4 +2.13.4 diff --git a/SOURCES/0017-RHEL-7-Reject-use-of-libguestfs-winsupport-features-.patch b/SOURCES/0017-RHEL-7-Reject-use-of-libguestfs-winsupport-features-.patch index 18ec5c3..399c924 100644 --- a/SOURCES/0017-RHEL-7-Reject-use-of-libguestfs-winsupport-features-.patch +++ b/SOURCES/0017-RHEL-7-Reject-use-of-libguestfs-winsupport-features-.patch @@ -9,7 +9,7 @@ Subject: [PATCH] RHEL 7: Reject use of libguestfs-winsupport features except 1 file changed, 17 insertions(+) diff --git a/generator/c.ml b/generator/c.ml -index 606c898..bba57c5 100644 +index 606c89807..bba57c56f 100644 --- a/generator/c.ml +++ b/generator/c.ml @@ -1856,12 +1856,29 @@ and generate_client_actions actions () = @@ -43,5 +43,5 @@ index 606c898..bba57c5 100644 * as a progress bar hint. *) -- -2.9.4 +2.13.4 diff --git a/SOURCES/0018-RHEL-7-daemon-umount-all-Hack-to-avoid-umount-sysroo.patch b/SOURCES/0018-RHEL-7-daemon-umount-all-Hack-to-avoid-umount-sysroo.patch index 729018e..59dd738 100644 --- a/SOURCES/0018-RHEL-7-daemon-umount-all-Hack-to-avoid-umount-sysroo.patch +++ b/SOURCES/0018-RHEL-7-daemon-umount-all-Hack-to-avoid-umount-sysroo.patch @@ -13,7 +13,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1246032 1 file changed, 5 insertions(+) diff --git a/daemon/mount.c b/daemon/mount.c -index f2aedfd..14b24bf 100644 +index f2aedfd11..14b24bff9 100644 --- a/daemon/mount.c +++ b/daemon/mount.c @@ -28,6 +28,8 @@ @@ -36,5 +36,5 @@ index f2aedfd..14b24bf 100644 for (i = 0; i < mounts.size; ++i) { CLEANUP_FREE char *err = NULL; -- -2.9.4 +2.13.4 diff --git a/SOURCES/0019-RHEL-7-Fix-tests-for-libguestfs-winsupport-7.2.patch b/SOURCES/0019-RHEL-7-Fix-tests-for-libguestfs-winsupport-7.2.patch index 37977e9..875a270 100644 --- a/SOURCES/0019-RHEL-7-Fix-tests-for-libguestfs-winsupport-7.2.patch +++ b/SOURCES/0019-RHEL-7-Fix-tests-for-libguestfs-winsupport-7.2.patch @@ -12,7 +12,7 @@ It doesn't let us use guestfish for arbitrary Windows edits. 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/test-data/phony-guests/make-windows-img.sh b/test-data/phony-guests/make-windows-img.sh -index 2d18ea4..9eed756 100755 +index 2d18ea489..9eed756d8 100755 --- a/test-data/phony-guests/make-windows-img.sh +++ b/test-data/phony-guests/make-windows-img.sh @@ -37,6 +37,7 @@ fi @@ -24,7 +24,7 @@ index 2d18ea4..9eed756 100755 run diff --git a/tests/charsets/test-charset-fidelity.c b/tests/charsets/test-charset-fidelity.c -index 952256e..d45e83c 100644 +index 952256edd..d45e83c13 100644 --- a/tests/charsets/test-charset-fidelity.c +++ b/tests/charsets/test-charset-fidelity.c @@ -93,6 +93,8 @@ main (int argc, char *argv[]) @@ -37,7 +37,7 @@ index 952256e..d45e83c 100644 exit (EXIT_FAILURE); diff --git a/v2v/test-v2v-virtio-win-iso.sh b/v2v/test-v2v-virtio-win-iso.sh -index 6e99f0f..a8e572c 100755 +index 6e99f0f1d..a8e572c5f 100755 --- a/v2v/test-v2v-virtio-win-iso.sh +++ b/v2v/test-v2v-virtio-win-iso.sh @@ -79,6 +79,12 @@ mktest () @@ -63,7 +63,7 @@ index 6e99f0f..a8e572c 100755 rm -r $d diff --git a/v2v/test-v2v-windows-conversion.sh b/v2v/test-v2v-windows-conversion.sh -index f1da222..ff94fe3 100755 +index f1da222a9..ff94fe39b 100755 --- a/v2v/test-v2v-windows-conversion.sh +++ b/v2v/test-v2v-windows-conversion.sh @@ -73,6 +73,12 @@ mktest () @@ -89,5 +89,5 @@ index f1da222..ff94fe3 100755 # We also update the Registry several times, for firstboot, and (ONLY -- -2.9.4 +2.13.4 diff --git a/SOURCES/0020-RHEL-7-Revert-v2v-Add-a-support-matrix-to-the-manual.patch b/SOURCES/0020-RHEL-7-Revert-v2v-Add-a-support-matrix-to-the-manual.patch index 0e29100..725e320 100644 --- a/SOURCES/0020-RHEL-7-Revert-v2v-Add-a-support-matrix-to-the-manual.patch +++ b/SOURCES/0020-RHEL-7-Revert-v2v-Add-a-support-matrix-to-the-manual.patch @@ -10,7 +10,7 @@ This reverts commit a03bffa15a5357d5d0244595caf99607be1ec3ab. 1 file changed, 97 deletions(-) diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod -index 79c742e..fca0a2a 100644 +index 79c742e3f..fca0a2a93 100644 --- a/v2v/virt-v2v.pod +++ b/v2v/virt-v2v.pod @@ -145,103 +145,6 @@ Since F contains the path(s) to the guest disk @@ -118,5 +118,5 @@ index 79c742e..fca0a2a 100644 =over 4 -- -2.9.4 +2.13.4 diff --git a/SOURCES/0021-RHEL-7-All-qemu-kvm-in-RHEL-7-supports-discard-of-qc.patch b/SOURCES/0021-RHEL-7-All-qemu-kvm-in-RHEL-7-supports-discard-of-qc.patch index e932d34..b01c0c2 100644 --- a/SOURCES/0021-RHEL-7-All-qemu-kvm-in-RHEL-7-supports-discard-of-qc.patch +++ b/SOURCES/0021-RHEL-7-All-qemu-kvm-in-RHEL-7-supports-discard-of-qc.patch @@ -12,7 +12,7 @@ For rationale behind this, see: 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/lib/qemu.c b/lib/qemu.c -index d60692f..6bb54b7 100644 +index d60692f0d..6bb54b70d 100644 --- a/lib/qemu.c +++ b/lib/qemu.c @@ -610,10 +610,6 @@ guestfs_int_discard_possible (guestfs_h *g, struct drive *drv, @@ -42,5 +42,5 @@ index d60692f..6bb54b7 100644 /* It's possible in future other formats will support discard, but * currently (qemu 1.7) none of them do. -- -2.9.4 +2.13.4 diff --git a/SOURCES/0022-RHEL-7-tests-Disable-daemon-tests-that-require-the-u.patch b/SOURCES/0022-RHEL-7-tests-Disable-daemon-tests-that-require-the-u.patch index 2640435..edf48ec 100644 --- a/SOURCES/0022-RHEL-7-tests-Disable-daemon-tests-that-require-the-u.patch +++ b/SOURCES/0022-RHEL-7-tests-Disable-daemon-tests-that-require-the-u.patch @@ -9,7 +9,7 @@ Subject: [PATCH] RHEL 7: tests: Disable daemon tests that require the 'unix' 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/daemon/Makefile.am b/tests/daemon/Makefile.am -index 053cad3..0d723fe 100644 +index 053cad3e1..0d723fee4 100644 --- a/tests/daemon/Makefile.am +++ b/tests/daemon/Makefile.am @@ -23,9 +23,7 @@ include $(top_srcdir)/subdir-rules.mk @@ -24,5 +24,5 @@ index 053cad3..0d723fe 100644 TESTS_ENVIRONMENT = $(top_builddir)/run --test -- -2.9.4 +2.13.4 diff --git a/SOURCES/0023-RHEL-7-v2v-Disable-the-virt-v2v-in-place-option.patch b/SOURCES/0023-RHEL-7-v2v-Disable-the-virt-v2v-in-place-option.patch index a6d404c..27e1379 100644 --- a/SOURCES/0023-RHEL-7-v2v-Disable-the-virt-v2v-in-place-option.patch +++ b/SOURCES/0023-RHEL-7-v2v-Disable-the-virt-v2v-in-place-option.patch @@ -16,7 +16,7 @@ wish to support in RHEL. delete mode 100755 v2v/test-v2v-in-place.sh diff --git a/v2v/Makefile.am b/v2v/Makefile.am -index 133a411..2974064 100644 +index 133a411bc..297406496 100644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -291,7 +291,6 @@ if HAVE_LIBVIRT @@ -36,7 +36,7 @@ index 133a411..2974064 100644 test-v2v-networks-and-bridges-expected.xml \ test-v2v-networks-and-bridges.sh \ diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml -index 9f02098..9aecb5c 100644 +index 9f02098c0..9aecb5cd6 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -179,7 +179,7 @@ let parse_cmdline () = @@ -60,7 +60,7 @@ index 9f02098..9aecb5c 100644 let error_option_cannot_be_used_in_output_mode mode opt = error (f_"-o %s: %s option cannot be used in this output mode") mode opt diff --git a/v2v/test-v2v-docs.sh b/v2v/test-v2v-docs.sh -index d341852..c5d98de 100755 +index d341852b7..c5d98de7f 100755 --- a/v2v/test-v2v-docs.sh +++ b/v2v/test-v2v-docs.sh @@ -22,4 +22,4 @@ $TEST_FUNCTIONS @@ -71,7 +71,7 @@ index d341852..c5d98de 100755 + --ignore=--dcPath,--debug-overlay,--ic,--if,--in-place,--no-trim,--oa,--oc,--of,--on,--os,--vmtype diff --git a/v2v/test-v2v-in-place.sh b/v2v/test-v2v-in-place.sh deleted file mode 100755 -index 6f7d78f..0000000 +index 6f7d78f39..000000000 --- a/v2v/test-v2v-in-place.sh +++ /dev/null @@ -1,108 +0,0 @@ @@ -184,7 +184,7 @@ index 6f7d78f..0000000 -# Clean up. -rm -r $d diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod -index fca0a2a..c45828b 100644 +index fca0a2a93..c45828b58 100644 --- a/v2v/virt-v2v.pod +++ b/v2v/virt-v2v.pod @@ -15,8 +15,6 @@ virt-v2v - Convert a guest to use KVM @@ -269,5 +269,5 @@ index fca0a2a..c45828b 100644 The I<--machine-readable> option can be used to make the output more -- -2.9.4 +2.13.4 diff --git a/SOURCES/0024-RHEL-7-v2v-Remove-dcpath-option-RHBZ-1315237-RHBZ-14.patch b/SOURCES/0024-RHEL-7-v2v-Remove-dcpath-option-RHBZ-1315237-RHBZ-14.patch index 156fc8e..8d9744d 100644 --- a/SOURCES/0024-RHEL-7-v2v-Remove-dcpath-option-RHBZ-1315237-RHBZ-14.patch +++ b/SOURCES/0024-RHEL-7-v2v-Remove-dcpath-option-RHBZ-1315237-RHBZ-14.patch @@ -12,7 +12,7 @@ This is no longer required, since RHEL 7.3. 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml -index 9aecb5c..a2f132b 100644 +index 9aecb5cd6..a2f132b6c 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -172,7 +172,7 @@ let parse_cmdline () = @@ -25,7 +25,7 @@ index 9aecb5c..a2f132b 100644 [ S 'i' ], Getopt.String (i_options, set_input_mode), s_"Set input mode (default: libvirt)"; [ M"ic" ], Getopt.String ("uri", set_string_option_once "-ic" input_conn), diff --git a/v2v/test-v2v-docs.sh b/v2v/test-v2v-docs.sh -index c5d98de..02750fa 100755 +index c5d98de7f..02750faf3 100755 --- a/v2v/test-v2v-docs.sh +++ b/v2v/test-v2v-docs.sh @@ -22,4 +22,4 @@ $TEST_FUNCTIONS @@ -35,7 +35,7 @@ index c5d98de..02750fa 100755 - --ignore=--dcPath,--debug-overlay,--ic,--if,--in-place,--no-trim,--oa,--oc,--of,--on,--os,--vmtype + --ignore=--dcpath,--dcPath,--debug-overlay,--ic,--if,--in-place,--no-trim,--oa,--oc,--of,--on,--os,--vmtype diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod -index c45828b..f4def73 100644 +index c45828b58..f4def737a 100644 --- a/v2v/virt-v2v.pod +++ b/v2v/virt-v2v.pod @@ -169,19 +169,6 @@ Write a compressed output file. This is only allowed if the output @@ -59,5 +59,5 @@ index c45828b..f4def73 100644 Save the overlay file(s) created during conversion. This option is -- -2.9.4 +2.13.4 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 6bb8256..1abb7fb 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 @@ -9,7 +9,7 @@ The SDL output mode is not supported in RHEL 7's qemu-kvm. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v2v/input_disk.ml b/v2v/input_disk.ml -index 27f8553..1f319a4 100644 +index 27f855352..1f319a487 100644 --- a/v2v/input_disk.ml +++ b/v2v/input_disk.ml @@ -83,7 +83,7 @@ class input_disk input_format disk = object @@ -22,5 +22,5 @@ index 27f8553..1f319a4 100644 s_video = None; s_sound = None; -- -2.9.4 +2.13.4 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 27828ef..459fe6d 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 @@ -9,7 +9,7 @@ They are not supported in RHEL 7. 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod -index f4def73..7ad674d 100644 +index f4def737a..7ad674d43 100644 --- a/v2v/virt-v2v.pod +++ b/v2v/virt-v2v.pod @@ -1178,8 +1178,7 @@ Remove the F and F files. @@ -23,5 +23,5 @@ index f4def73..7ad674d 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.9.4 +2.13.4 diff --git a/SOURCES/0027-sysprep-Remove-DHCP_HOSTNAME-from-ifcfg-files-RHBZ-1.patch b/SOURCES/0027-sysprep-Remove-DHCP_HOSTNAME-from-ifcfg-files-RHBZ-1.patch index 3d5bfda..8fc66d6 100644 --- a/SOURCES/0027-sysprep-Remove-DHCP_HOSTNAME-from-ifcfg-files-RHBZ-1.patch +++ b/SOURCES/0027-sysprep-Remove-DHCP_HOSTNAME-from-ifcfg-files-RHBZ-1.patch @@ -10,7 +10,7 @@ Subject: [PATCH] sysprep: Remove DHCP_HOSTNAME= from ifcfg-* files 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sysprep/sysprep_operation_net_hostname.ml b/sysprep/sysprep_operation_net_hostname.ml -index 3824d42..7284d63 100644 +index 3824d42ae..7284d630f 100644 --- a/sysprep/sysprep_operation_net_hostname.ml +++ b/sysprep/sysprep_operation_net_hostname.ml @@ -30,10 +30,12 @@ let net_hostname_perform (g : Guestfs.guestfs) root side_effects = @@ -38,5 +38,5 @@ index 3824d42..7284d63 100644 For Fedora and Red Hat Enterprise Linux, this is removed from C files."); -- -2.9.4 +2.13.4 diff --git a/SOURCES/0028-p2v-v2v-Ensure-the-full-version-is-always-available-.patch b/SOURCES/0028-p2v-v2v-Ensure-the-full-version-is-always-available-.patch index 28b0f4a..251d7fb 100644 --- a/SOURCES/0028-p2v-v2v-Ensure-the-full-version-is-always-available-.patch +++ b/SOURCES/0028-p2v-v2v-Ensure-the-full-version-is-always-available-.patch @@ -39,7 +39,7 @@ for end users. 3 files changed, 46 insertions(+), 6 deletions(-) diff --git a/p2v/conversion.c b/p2v/conversion.c -index 0c17ef2..beda2b8 100644 +index 0c17ef242..beda2b89b 100644 --- a/p2v/conversion.c +++ b/p2v/conversion.c @@ -95,6 +95,7 @@ static void generate_libvirt_xml (struct config *, struct data_conn *, const cha @@ -143,7 +143,7 @@ index 0c17ef2..beda2b8 100644 + fclose (fp); +} diff --git a/p2v/virt-p2v.pod b/p2v/virt-p2v.pod -index 4a5f587..ee870fd 100644 +index 4a5f58724..ee870fdd9 100644 --- a/p2v/virt-p2v.pod +++ b/p2v/virt-p2v.pod @@ -767,6 +767,14 @@ Note this is not "real" libvirt XML (and must B be loaded into @@ -162,7 +162,7 @@ index 4a5f587..ee870fd 100644 I<(after conversion)> diff --git a/v2v/v2v.ml b/v2v/v2v.ml -index 551524d..cc7b889 100644 +index 551524dc5..cc7b88966 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -42,8 +42,8 @@ let rec main () = @@ -177,5 +177,5 @@ index 551524d..cc7b889 100644 (* Print the libvirt version if debugging. Note that if * we're configured --without-libvirt, then this will throw -- -2.9.4 +2.13.4 diff --git a/SOURCES/0029-p2v-Run-fewer-scp-commands.patch b/SOURCES/0029-p2v-Run-fewer-scp-commands.patch index 275cc4c..e714803 100644 --- a/SOURCES/0029-p2v-Run-fewer-scp-commands.patch +++ b/SOURCES/0029-p2v-Run-fewer-scp-commands.patch @@ -20,7 +20,7 @@ informational files. 3 files changed, 33 insertions(+), 25 deletions(-) diff --git a/p2v/conversion.c b/p2v/conversion.c -index beda2b8..0da9a62 100644 +index beda2b89b..0da9a62e0 100644 --- a/p2v/conversion.c +++ b/p2v/conversion.c @@ -366,28 +366,19 @@ start_conversion (struct config *config, @@ -64,7 +64,7 @@ index beda2b8..0da9a62 100644 /* Do the conversion. This runs until virt-v2v exits. */ if (notify_ui) diff --git a/p2v/p2v.h b/p2v/p2v.h -index 5223aa2..b26648a 100644 +index 5223aa216..b26648a01 100644 --- a/p2v/p2v.h +++ b/p2v/p2v.h @@ -128,7 +128,7 @@ extern int test_connection (struct config *); @@ -77,7 +77,7 @@ index 5223aa2..b26648a 100644 /* nbd.c */ extern void set_nbd_option (const char *opt); diff --git a/p2v/ssh.c b/p2v/ssh.c -index 8beaf74..bfeb806 100644 +index 8beaf74bb..bfeb80661 100644 --- a/p2v/ssh.c +++ b/p2v/ssh.c @@ -572,14 +572,18 @@ start_ssh (unsigned spawn_flags, struct config *config, @@ -130,5 +130,5 @@ index 8beaf74..bfeb806 100644 #if DEBUG_STDERR -- -2.9.4 +2.13.4 diff --git a/SOURCES/0030-p2v-Fix-list-of-files-in-documentation.patch b/SOURCES/0030-p2v-Fix-list-of-files-in-documentation.patch index ce7471d..cf988af 100644 --- a/SOURCES/0030-p2v-Fix-list-of-files-in-documentation.patch +++ b/SOURCES/0030-p2v-Fix-list-of-files-in-documentation.patch @@ -9,7 +9,7 @@ Subject: [PATCH] p2v: Fix list of files in documentation. 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/p2v/virt-p2v.pod b/p2v/virt-p2v.pod -index ee870fd..7fd6371 100644 +index ee870fdd9..7fd637152 100644 --- a/p2v/virt-p2v.pod +++ b/p2v/virt-p2v.pod @@ -724,18 +724,6 @@ Into this directory are written various files which include: @@ -62,5 +62,5 @@ index ee870fd..7fd6371 100644 This is the wrapper script which is used when running virt-v2v. For interest only, do not attempt to run this script yourself. -- -2.9.4 +2.13.4 diff --git a/SOURCES/0031-p2v-tests-Fix-fake-scp-command-so-it-can-handle-mult.patch b/SOURCES/0031-p2v-tests-Fix-fake-scp-command-so-it-can-handle-mult.patch index 2a37eb6..5227af2 100644 --- a/SOURCES/0031-p2v-tests-Fix-fake-scp-command-so-it-can-handle-mult.patch +++ b/SOURCES/0031-p2v-tests-Fix-fake-scp-command-so-it-can-handle-mult.patch @@ -12,7 +12,7 @@ Fixes commit d178deeeb814471b9d70431626b6cd515a21d0c1. 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/p2v/test-virt-p2v-scp.sh b/p2v/test-virt-p2v-scp.sh -index c8a405d..29900b6 100755 +index c8a405db4..29900b663 100755 --- a/p2v/test-virt-p2v-scp.sh +++ b/p2v/test-virt-p2v-scp.sh @@ -44,15 +44,19 @@ while true ; do @@ -42,5 +42,5 @@ index c8a405d..29900b6 100755 -exec cp "$local" "$remote" +exec cp "$@" "$remote" -- -2.9.4 +2.13.4 diff --git a/SOURCES/0032-v2v-windows-convert-fix-virtio-block-driver-installa.patch b/SOURCES/0032-v2v-windows-convert-fix-virtio-block-driver-installa.patch index 9452024..73059d6 100644 --- a/SOURCES/0032-v2v-windows-convert-fix-virtio-block-driver-installa.patch +++ b/SOURCES/0032-v2v-windows-convert-fix-virtio-block-driver-installa.patch @@ -17,7 +17,7 @@ Signed-off-by: Pavel Butsykin 1 file changed, 7 insertions(+) diff --git a/v2v/windows_virtio.ml b/v2v/windows_virtio.ml -index 2f5349d..965d6ac 100644 +index 2f5349d25..965d6ac8b 100644 --- a/v2v/windows_virtio.ml +++ b/v2v/windows_virtio.ml @@ -220,6 +220,13 @@ and ddb_regedits inspect drv_name drv_pciid = @@ -35,5 +35,5 @@ index 2f5349d..965d6ac 100644 "Configurations"; drv_config ], [ "ConfigFlags", REG_DWORD 0_l; -- -2.9.4 +2.13.4 diff --git a/SOURCES/0033-v2v-o-qemu-Fix-creation-of-ICH6-sound-device.patch b/SOURCES/0033-v2v-o-qemu-Fix-creation-of-ICH6-sound-device.patch index dd86178..1f9a86d 100644 --- a/SOURCES/0033-v2v-o-qemu-Fix-creation-of-ICH6-sound-device.patch +++ b/SOURCES/0033-v2v-o-qemu-Fix-creation-of-ICH6-sound-device.patch @@ -11,7 +11,7 @@ Fixes commit f6ece2c01a9a1a43d6715103e7dbdda0f09ee862. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v2v/output_qemu.ml b/v2v/output_qemu.ml -index 84efd45..abff29c 100644 +index 84efd4529..abff29c2b 100644 --- a/v2v/output_qemu.ml +++ b/v2v/output_qemu.ml @@ -183,7 +183,7 @@ object @@ -24,5 +24,5 @@ index 84efd45..abff29c 100644 | PCSpeaker -> arg "-soundhw" "pcspk" (* not qdev-ified *) | SB16 -> arg "-device" "sb16" -- -2.9.4 +2.13.4 diff --git a/SOURCES/0034-ocaml-Add-Bytes.sub_string-function-to-Bytes-compat-.patch b/SOURCES/0034-ocaml-Add-Bytes.sub_string-function-to-Bytes-compat-.patch index 7d170f7..5a4730e 100644 --- a/SOURCES/0034-ocaml-Add-Bytes.sub_string-function-to-Bytes-compat-.patch +++ b/SOURCES/0034-ocaml-Add-Bytes.sub_string-function-to-Bytes-compat-.patch @@ -12,7 +12,7 @@ versions the real Bytes.sub_string function is used instead. 1 file changed, 1 insertion(+) diff --git a/m4/guestfs_ocaml.m4 b/m4/guestfs_ocaml.m4 -index 0479e70..d8bd89f 100644 +index 0479e70ab..d8bd89f00 100644 --- a/m4/guestfs_ocaml.m4 +++ b/m4/guestfs_ocaml.m4 @@ -120,6 +120,7 @@ AS_IF([test "x$have_Bytes_module" = "xno"],[ @@ -24,5 +24,5 @@ index 0479e70..d8bd89f 100644 ln -s ../generator/bytes.ml mllib/bytes.ml OCAML_GENERATOR_BYTES_COMPAT_CMO='$(top_builddir)/generator/bytes.cmo' -- -2.9.4 +2.13.4 diff --git a/SOURCES/0035-mllib-Add-Char.hexdigit-function.patch b/SOURCES/0035-mllib-Add-Char.hexdigit-function.patch index cde0448..de1d233 100644 --- a/SOURCES/0035-mllib-Add-Char.hexdigit-function.patch +++ b/SOURCES/0035-mllib-Add-Char.hexdigit-function.patch @@ -12,7 +12,7 @@ Same as the function defined in fish/fish.c. 2 files changed, 23 insertions(+) diff --git a/mllib/common_utils.ml b/mllib/common_utils.ml -index e1d6329..4593614 100644 +index e1d63292e..4593614aa 100644 --- a/mllib/common_utils.ml +++ b/mllib/common_utils.ml @@ -70,6 +70,25 @@ module Char = struct @@ -42,7 +42,7 @@ index e1d6329..4593614 100644 module String = struct diff --git a/mllib/common_utils.mli b/mllib/common_utils.mli -index 1cd38ba..ec41a8f 100644 +index 1cd38ba83..ec41a8ff8 100644 --- a/mllib/common_utils.mli +++ b/mllib/common_utils.mli @@ -43,6 +43,10 @@ module Char : sig @@ -57,5 +57,5 @@ index 1cd38ba..ec41a8f 100644 (** Override the Char module from stdlib. *) -- -2.9.4 +2.13.4 diff --git a/SOURCES/0036-v2v-Implement-i-vmx-to-read-VMware-vmx-files-directl.patch b/SOURCES/0036-v2v-Implement-i-vmx-to-read-VMware-vmx-files-directl.patch index d67e5ad..ec063d5 100644 --- a/SOURCES/0036-v2v-Implement-i-vmx-to-read-VMware-vmx-files-directl.patch +++ b/SOURCES/0036-v2v-Implement-i-vmx-to-read-VMware-vmx-files-directl.patch @@ -54,7 +54,7 @@ real guests. create mode 100755 v2v/test-v2v-i-vmx.sh diff --git a/v2v/Makefile.am b/v2v/Makefile.am -index 2974064..0df759e 100644 +index 297406496..0df759eca 100644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -38,6 +38,7 @@ SOURCES_MLI = \ @@ -122,7 +122,7 @@ index 2974064..0df759e 100644 v2v_unit_tests_XOBJECTS = $(v2v_unit_tests_BOBJECTS:.cmo=.cmx) diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml -index a2f132b..0850f91 100644 +index a2f132b6c..0850f9136 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -86,6 +86,7 @@ let parse_cmdline () = @@ -153,7 +153,7 @@ index a2f132b..0850f91 100644 if in_place then diff --git a/v2v/input_vmx.ml b/v2v/input_vmx.ml new file mode 100644 -index 0000000..bb09f0b +index 000000000..bb09f0bf8 --- /dev/null +++ b/v2v/input_vmx.ml @@ -0,0 +1,349 @@ @@ -508,7 +508,7 @@ index 0000000..bb09f0b +let () = Modules_list.register_input_module "vmx" diff --git a/v2v/input_vmx.mli b/v2v/input_vmx.mli new file mode 100644 -index 0000000..f236f87 +index 000000000..f236f8716 --- /dev/null +++ b/v2v/input_vmx.mli @@ -0,0 +1,22 @@ @@ -535,7 +535,7 @@ index 0000000..f236f87 +val input_vmx : string -> Types.input +(** [input_vmx filename] sets up an input from vmware vmx file. *) diff --git a/v2v/name_from_disk.ml b/v2v/name_from_disk.ml -index 82f0925..452d946 100644 +index 82f09250a..452d9462c 100644 --- a/v2v/name_from_disk.ml +++ b/v2v/name_from_disk.ml @@ -24,7 +24,7 @@ let name_from_disk disk = @@ -549,7 +549,7 @@ index 82f0925..452d946 100644 let rec loop = function diff --git a/v2v/parse_vmx.ml b/v2v/parse_vmx.ml new file mode 100644 -index 0000000..33ec17d +index 000000000..33ec17d3d --- /dev/null +++ b/v2v/parse_vmx.ml @@ -0,0 +1,381 @@ @@ -936,7 +936,7 @@ index 0000000..33ec17d + Failure _ | Not_found -> false diff --git a/v2v/parse_vmx.mli b/v2v/parse_vmx.mli new file mode 100644 -index 0000000..0e4f21f +index 000000000..0e4f21f07 --- /dev/null +++ b/v2v/parse_vmx.mli @@ -0,0 +1,89 @@ @@ -1031,7 +1031,7 @@ index 0000000..0e4f21f +(** Same as {!print} but it creates a printable (multiline) string. *) diff --git a/v2v/test-v2v-i-vmx-1.expected b/v2v/test-v2v-i-vmx-1.expected new file mode 100644 -index 0000000..d32a299 +index 000000000..d32a29987 --- /dev/null +++ b/v2v/test-v2v-i-vmx-1.expected @@ -0,0 +1,42 @@ @@ -1079,7 +1079,7 @@ index 0000000..d32a299 + diff --git a/v2v/test-v2v-i-vmx-1.vmx b/v2v/test-v2v-i-vmx-1.vmx new file mode 100644 -index 0000000..3f2f060 +index 000000000..3f2f060a5 --- /dev/null +++ b/v2v/test-v2v-i-vmx-1.vmx @@ -0,0 +1,172 @@ @@ -1257,7 +1257,7 @@ index 0000000..3f2f060 +tools.remindInstall = "TRUE" diff --git a/v2v/test-v2v-i-vmx-2.expected b/v2v/test-v2v-i-vmx-2.expected new file mode 100644 -index 0000000..dc3eb60 +index 000000000..dc3eb60f2 --- /dev/null +++ b/v2v/test-v2v-i-vmx-2.expected @@ -0,0 +1,22 @@ @@ -1285,7 +1285,7 @@ index 0000000..dc3eb60 + diff --git a/v2v/test-v2v-i-vmx-2.vmx b/v2v/test-v2v-i-vmx-2.vmx new file mode 100644 -index 0000000..d9dcf3a +index 000000000..d9dcf3a5c --- /dev/null +++ b/v2v/test-v2v-i-vmx-2.vmx @@ -0,0 +1,84 @@ @@ -1375,7 +1375,7 @@ index 0000000..d9dcf3a +tools.syncTime = "FALSE" diff --git a/v2v/test-v2v-i-vmx-3.expected b/v2v/test-v2v-i-vmx-3.expected new file mode 100644 -index 0000000..9e64352 +index 000000000..9e643526f --- /dev/null +++ b/v2v/test-v2v-i-vmx-3.expected @@ -0,0 +1,22 @@ @@ -1403,7 +1403,7 @@ index 0000000..9e64352 + diff --git a/v2v/test-v2v-i-vmx-3.vmx b/v2v/test-v2v-i-vmx-3.vmx new file mode 100644 -index 0000000..c392155 +index 000000000..c39215555 --- /dev/null +++ b/v2v/test-v2v-i-vmx-3.vmx @@ -0,0 +1,91 @@ @@ -1500,7 +1500,7 @@ index 0000000..c392155 +tools.syncTime = "FALSE" diff --git a/v2v/test-v2v-i-vmx-4.expected b/v2v/test-v2v-i-vmx-4.expected new file mode 100644 -index 0000000..a70533d +index 000000000..a70533d2e --- /dev/null +++ b/v2v/test-v2v-i-vmx-4.expected @@ -0,0 +1,22 @@ @@ -1528,7 +1528,7 @@ index 0000000..a70533d + diff --git a/v2v/test-v2v-i-vmx-4.vmx b/v2v/test-v2v-i-vmx-4.vmx new file mode 100644 -index 0000000..7756cf2 +index 000000000..7756cf248 --- /dev/null +++ b/v2v/test-v2v-i-vmx-4.vmx @@ -0,0 +1,88 @@ @@ -1622,7 +1622,7 @@ index 0000000..7756cf2 +tools.remindInstall = "TRUE" diff --git a/v2v/test-v2v-i-vmx.sh b/v2v/test-v2v-i-vmx.sh new file mode 100755 -index 0000000..5353e7e +index 000000000..5353e7e2a --- /dev/null +++ b/v2v/test-v2v-i-vmx.sh @@ -0,0 +1,48 @@ @@ -1675,7 +1675,7 @@ index 0000000..5353e7e + +rm test-v2v-i-vmx-*.actual diff --git a/v2v/v2v_unit_tests.ml b/v2v/v2v_unit_tests.ml -index bd65788..dd805a3 100644 +index bd65788b0..dd805a3ab 100644 --- a/v2v/v2v_unit_tests.ml +++ b/v2v/v2v_unit_tests.ml @@ -787,6 +787,148 @@ let test_qemu_img_supports ctx = @@ -1836,7 +1836,7 @@ index bd65788..dd805a3 100644 let () = diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod -index 7ad674d..31d1ce0 100644 +index 7ad674d43..31d1ce029 100644 --- a/v2v/virt-v2v.pod +++ b/v2v/virt-v2v.pod @@ -41,7 +41,8 @@ libguestfs E 1.28. @@ -1950,5 +1950,5 @@ index 7ad674d..31d1ce0 100644 You can use the L tool to copy the guest off the hypervisor into a local file, and then convert it. -- -2.9.4 +2.13.4 diff --git a/SOURCES/0037-v2v-tests-Fix-i-vmx-test-so-it-is-more-stable.patch b/SOURCES/0037-v2v-tests-Fix-i-vmx-test-so-it-is-more-stable.patch index 848213a..81b8164 100644 --- a/SOURCES/0037-v2v-tests-Fix-i-vmx-test-so-it-is-more-stable.patch +++ b/SOURCES/0037-v2v-tests-Fix-i-vmx-test-so-it-is-more-stable.patch @@ -19,7 +19,7 @@ Fixes commit ca40078cdda9167d4658ddfe24c828c7ee76be37. 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/v2v/test-v2v-i-vmx-1.expected b/v2v/test-v2v-i-vmx-1.expected -index d32a299..902a850 100644 +index d32a29987..902a850c5 100644 --- a/v2v/test-v2v-i-vmx-1.expected +++ b/v2v/test-v2v-i-vmx-1.expected @@ -1,4 +1,4 @@ @@ -29,7 +29,7 @@ index d32a299..902a850 100644 source name: BZ1308535_21disks diff --git a/v2v/test-v2v-i-vmx-2.expected b/v2v/test-v2v-i-vmx-2.expected -index dc3eb60..6e87862 100644 +index dc3eb60f2..6e87862ac 100644 --- a/v2v/test-v2v-i-vmx-2.expected +++ b/v2v/test-v2v-i-vmx-2.expected @@ -1,4 +1,4 @@ @@ -39,7 +39,7 @@ index dc3eb60..6e87862 100644 source name: Fedora 20 diff --git a/v2v/test-v2v-i-vmx-3.expected b/v2v/test-v2v-i-vmx-3.expected -index 9e64352..0d1585b 100644 +index 9e643526f..0d1585b96 100644 --- a/v2v/test-v2v-i-vmx-3.expected +++ b/v2v/test-v2v-i-vmx-3.expected @@ -1,4 +1,4 @@ @@ -49,7 +49,7 @@ index 9e64352..0d1585b 100644 source name: RHEL 7.1 UEFI diff --git a/v2v/test-v2v-i-vmx-4.expected b/v2v/test-v2v-i-vmx-4.expected -index a70533d..06f58d7 100644 +index a70533d2e..06f58d7ad 100644 --- a/v2v/test-v2v-i-vmx-4.expected +++ b/v2v/test-v2v-i-vmx-4.expected @@ -1,4 +1,4 @@ @@ -59,7 +59,7 @@ index a70533d..06f58d7 100644 source name: Windows 7 x64 diff --git a/v2v/test-v2v-i-vmx.sh b/v2v/test-v2v-i-vmx.sh -index 5353e7e..997103d 100755 +index 5353e7e2a..997103d41 100755 --- a/v2v/test-v2v-i-vmx.sh +++ b/v2v/test-v2v-i-vmx.sh @@ -37,6 +37,7 @@ for i in 1 2 3 4; do @@ -71,5 +71,5 @@ index 5353e7e..997103d 100755 < test-v2v-i-vmx-$i.actual.old > test-v2v-i-vmx-$i.actual rm test-v2v-i-vmx-$i.actual.old -- -2.9.4 +2.13.4 diff --git a/SOURCES/0038-v2v-o-rhv-Quote-parameter-to-rm-rf.patch b/SOURCES/0038-v2v-o-rhv-Quote-parameter-to-rm-rf.patch index b8784d2..4646451 100644 --- a/SOURCES/0038-v2v-o-rhv-Quote-parameter-to-rm-rf.patch +++ b/SOURCES/0038-v2v-o-rhv-Quote-parameter-to-rm-rf.patch @@ -11,7 +11,7 @@ This was safe before, the change just prevents accidental errors. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v2v/output_rhv.ml b/v2v/output_rhv.ml -index f407b4e..02bd312 100644 +index f407b4eda..02bd31269 100644 --- a/v2v/output_rhv.ml +++ b/v2v/output_rhv.ml @@ -205,7 +205,7 @@ object @@ -24,5 +24,5 @@ index f407b4e..02bd312 100644 ) image_uuids ) -- -2.9.4 +2.13.4 diff --git a/SOURCES/0039-v2v-windows-Install-both-legacy-and-modern-virtio-ke.patch b/SOURCES/0039-v2v-windows-Install-both-legacy-and-modern-virtio-ke.patch index 0ad4055..62912ab 100644 --- a/SOURCES/0039-v2v-windows-Install-both-legacy-and-modern-virtio-ke.patch +++ b/SOURCES/0039-v2v-windows-Install-both-legacy-and-modern-virtio-ke.patch @@ -12,7 +12,7 @@ Thanks: Ladi Prosek (for diagnosing the problem and proposing the fix) 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/v2v/windows_virtio.ml b/v2v/windows_virtio.ml -index 965d6ac..9e6088c 100644 +index 965d6ac8b..9e6088c28 100644 --- a/v2v/windows_virtio.ml +++ b/v2v/windows_virtio.ml @@ -34,8 +34,10 @@ let virtio_win = @@ -49,5 +49,5 @@ index 965d6ac..9e6088c 100644 | Some IDE, _, _ -> -- -2.9.4 +2.13.4 diff --git a/SOURCES/0040-v2v-o-rhv-Add-Windows-2016-Server-type-in-OVF-output.patch b/SOURCES/0040-v2v-o-rhv-Add-Windows-2016-Server-type-in-OVF-output.patch index cba1b1f..895d438 100644 --- a/SOURCES/0040-v2v-o-rhv-Add-Windows-2016-Server-type-in-OVF-output.patch +++ b/SOURCES/0040-v2v-o-rhv-Add-Windows-2016-Server-type-in-OVF-output.patch @@ -15,7 +15,7 @@ https://github.com/oVirt/ovirt-engine/commit/d233325d7b808e8bae83645ac645dfea9df 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/v2v/OVF.ml b/v2v/OVF.ml -index 1f838f5..e380d35 100644 +index 1f838f543..e380d35f6 100644 --- a/v2v/OVF.ml +++ b/v2v/OVF.ml @@ -194,9 +194,13 @@ and get_ostype = function @@ -34,5 +34,5 @@ index 1f838f5..e380d35 100644 i_major_version = major; i_minor_version = minor; i_arch = arch; i_product_name = product } -> -- -2.9.4 +2.13.4 diff --git a/SOURCES/0041-daemon-lvm-Pass-yes-option-to-force-pvresize-RHBZ-14.patch b/SOURCES/0041-daemon-lvm-Pass-yes-option-to-force-pvresize-RHBZ-14.patch index 9304171..ab0ecee 100644 --- a/SOURCES/0041-daemon-lvm-Pass-yes-option-to-force-pvresize-RHBZ-14.patch +++ b/SOURCES/0041-daemon-lvm-Pass-yes-option-to-force-pvresize-RHBZ-14.patch @@ -20,7 +20,7 @@ Note this does NOT break earlier versions which just ignore this flag. 1 file changed, 1 insertion(+) diff --git a/daemon/lvm.c b/daemon/lvm.c -index a270b13..085e852 100644 +index a270b1305..085e852f1 100644 --- a/daemon/lvm.c +++ b/daemon/lvm.c @@ -625,6 +625,7 @@ do_pvresize_size (const char *device, int64_t size) @@ -32,5 +32,5 @@ index a270b13..085e852 100644 device, NULL); if (r == -1) { -- -2.9.4 +2.13.4 diff --git a/SOURCES/0042-resize-make-sure-the-input-disk-is-read-only.patch b/SOURCES/0042-resize-make-sure-the-input-disk-is-read-only.patch index 8618a8f..57f41f9 100644 --- a/SOURCES/0042-resize-make-sure-the-input-disk-is-read-only.patch +++ b/SOURCES/0042-resize-make-sure-the-input-disk-is-read-only.patch @@ -11,7 +11,7 @@ Fixes commit 8a2b0738d1b79f288b14fc35294567430d10b7ec. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resize/resize.ml b/resize/resize.ml -index dc96b23..4028aa1 100644 +index dc96b23ea..4028aa1ac 100644 --- a/resize/resize.ml +++ b/resize/resize.ml @@ -348,7 +348,7 @@ read the man page virt-resize(1). @@ -24,5 +24,5 @@ index dc96b23..4028aa1 100644 add_drive_uri g ?format:output_format ~readonly:false ~cachemode:"unsafe" (snd outfile); -- -2.9.4 +2.13.4 diff --git a/SOURCES/0043-lib-libvirt-Pass-copyonread-flag-through-to-the-libv.patch b/SOURCES/0043-lib-libvirt-Pass-copyonread-flag-through-to-the-libv.patch index 0227bd6..5fb5f1d 100644 --- a/SOURCES/0043-lib-libvirt-Pass-copyonread-flag-through-to-the-libv.patch +++ b/SOURCES/0043-lib-libvirt-Pass-copyonread-flag-through-to-the-libv.patch @@ -16,7 +16,7 @@ Thanks: Kun Wei. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c -index 0c2879d..144937b 100644 +index 0c2879dbf..144937b5b 100644 --- a/lib/launch-libvirt.c +++ b/lib/launch-libvirt.c @@ -1547,7 +1547,8 @@ construct_libvirt_xml_disk (guestfs_h *g, @@ -30,5 +30,5 @@ index 0c2879d..144937b 100644 return -1; } -- -2.9.4 +2.13.4 diff --git a/SOURCES/0044-RHEL-7-v2v-disable-unconfig-of-manually-installed-VM.patch b/SOURCES/0044-RHEL-7-v2v-disable-unconfig-of-manually-installed-VM.patch new file mode 100644 index 0000000..2bb50df --- /dev/null +++ b/SOURCES/0044-RHEL-7-v2v-disable-unconfig-of-manually-installed-VM.patch @@ -0,0 +1,36 @@ +From 6e33d4506d9a454921cac0207646ff1a1ba02684 Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Mon, 14 Aug 2017 10:02:13 +0200 +Subject: [PATCH] RHEL 7: v2v: disable unconfig of manually installed VMware + tools (RHBZ#1477905) + +It looks like they may require connection to the VMware servers, which +is not always available during conversion. +--- + v2v/convert_linux.ml | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml +index 6c4985e84..d5c5825f4 100644 +--- a/v2v/convert_linux.ml ++++ b/v2v/convert_linux.ml +@@ -295,6 +295,7 @@ let rec convert (g : G.guestfs) inspect source output rcaps = + let remove = !remove in + Linux.remove g inspect remove; + ++(* + (* VMware Tools may have been installed from a tarball, so the + * above code won't remove it. Look for the uninstall tool and run + * if present. +@@ -311,6 +312,8 @@ let rec convert (g : G.guestfs) inspect source output rcaps = + warning (f_"VMware tools was detected, but uninstallation failed. The error message was: %s (ignored)") + msg + ) ++*) ++ () + + and unconfigure_citrix () = + let pkgs = +-- +2.13.4 + diff --git a/SPECS/libguestfs.spec b/SPECS/libguestfs.spec index 0a7fa89..4366c7a 100644 --- a/SPECS/libguestfs.spec +++ b/SPECS/libguestfs.spec @@ -14,7 +14,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.36.3 -Release: 6%{?dist}.2 +Release: 6%{?dist}.3 License: LGPLv2+ # Source and patches. @@ -76,6 +76,7 @@ Patch0040: 0040-v2v-o-rhv-Add-Windows-2016-Server-type-in-OVF-output.patch Patch0041: 0041-daemon-lvm-Pass-yes-option-to-force-pvresize-RHBZ-14.patch Patch0042: 0042-resize-make-sure-the-input-disk-is-read-only.patch Patch0043: 0043-lib-libvirt-Pass-copyonread-flag-through-to-the-libv.patch +Patch0044: 0044-RHEL-7-v2v-disable-unconfig-of-manually-installed-VM.patch # Use git for patch management. BuildRequires: git @@ -1291,6 +1292,10 @@ install -m 0644 utils/boot-benchmark/boot-benchmark.1 $RPM_BUILD_ROOT%{_mandir}/ %changelog +* Wed Aug 02 2017 Pino Toscano - 1:1.36.3-6.el7_4.3 +- v2v: disable unconfiguration of manually installed VMware tools. + resolves: rhbz#1480623 + * Mon Jul 17 2017 Pino Toscano - 1:1.36.3-6.el7_4.2 - Make sure kernel-rt is never used as Requires. resolves: rhbz#1471829