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 720bb76..ad68535 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 973e14b..428fdc6 100644 static int -- -2.7.4 +1.8.3.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 b50bad9..1f12198 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 @@ -340,5 +340,5 @@ index d025941..d4058ac 100644 gobject/src/optargs-ntfsclone_out.c gobject/src/optargs-ntfsfix.c -- -2.7.4 +1.8.3.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 5fb0036..56746fa 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 @@ -600,5 +600,5 @@ index bcb7841..c0239ff 100755 -grep -sq -- '-drive file=ssh://rich@example.com/disk.img,' "$DEBUG_QEMU_FILE" || fail -rm "$DEBUG_QEMU_FILE" -- -2.7.4 +1.8.3.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 6c40b0b..77c228f 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 0e2149e..38be7a8 100644 static int shutdown_uml (guestfs_h *g, void *datav, int check_for_errors) -- -2.7.4 +1.8.3.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 a20e3a6..65138cc 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 9bef83b..d079ccd 100644 fpf "%s-name %s" nl (quote source.s_name); fpf "%s-machine accel=kvm:tcg" nl; -- -2.7.4 +1.8.3.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 dedef8b..03d6b7d 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 0cde486..dcbaec2 100644 =item B<--quiet> -- -2.7.4 +1.8.3.1 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 41de4a0..687cec7 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 @@ -70,5 +70,5 @@ index c7bfa24..214b5cd 100755 guestfish --network -N test-rsync.img=fs -m /dev/sda1 <secrets[i].secret); free (data->secrets); -- -2.7.4 +1.8.3.1 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 487de94..ffb289b 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 @@ -82,5 +82,5 @@ index 38ca4a5..4b87301 100644 ignore_errors (void *ignore, virErrorPtr ignore2) { -- -2.7.4 +1.8.3.1 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 7c21f2c..cb923f4 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 @@ -22,5 +22,5 @@ index 70af72d2..4696a73 100644 gfs2-utils grub -- -2.7.4 +1.8.3.1 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 4857c97..e3584f3 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 @@ -24,5 +24,5 @@ index 4696a73..306b920 100644 hivex iproute2 -- -2.7.4 +1.8.3.1 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 c63b375..9cee57f 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 @@ -90,5 +90,5 @@ index 306b920..e93e5e8 100644 gfs2-utils grub -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0014-RHEL-7-v2v-Disable-unconfiguration-of-VMware-drivers.patch b/SOURCES/0014-RHEL-7-v2v-Disable-unconfiguration-of-VMware-drivers.patch index 41d0af7..e4473b6 100644 --- a/SOURCES/0014-RHEL-7-v2v-Disable-unconfiguration-of-VMware-drivers.patch +++ b/SOURCES/0014-RHEL-7-v2v-Disable-unconfiguration-of-VMware-drivers.patch @@ -40,5 +40,5 @@ index 17fda7c..bdbd06b 100644 unconfigure_kudzu (); -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0015-RHEL-7-Disable-alternate-Augeas-lenses.patch b/SOURCES/0015-RHEL-7-Disable-alternate-Augeas-lenses.patch index f91b281..4f83aa2 100644 --- a/SOURCES/0015-RHEL-7-Disable-alternate-Augeas-lenses.patch +++ b/SOURCES/0015-RHEL-7-Disable-alternate-Augeas-lenses.patch @@ -80,5 +80,5 @@ index aa8fd59..83150d1 100644 if (r == -1) { AUGEAS_ERROR ("aug_transform"); -- -2.7.4 +1.8.3.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 0121481..e0b3666 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 d1ef7b0..898b8d4 100644 external ovmf_i386_firmware : unit -> (string * string) list = "v2v_utils_ovmf_i386_firmware" external ovmf_x86_64_firmware : unit -> (string * string) list = "v2v_utils_ovmf_x86_64_firmware" -- -2.7.4 +1.8.3.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 177247c..04b86c3 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 @@ -60,5 +60,5 @@ index 898b8d4..d88f8ad 100644 if Sys.file_exists code && Sys.file_exists vars_template then ret else loop rest -- -2.7.4 +1.8.3.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 20df365..f0d45a2 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 8dcdd67..5714900 100644 * as a progress bar hint. *) -- -2.7.4 +1.8.3.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 d078c19..fc82564 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 869c9b8..7903bc2 100644 for (i = 0; i < mounts.size; ++i) { CLEANUP_FREE char *err = NULL; -- -2.7.4 +1.8.3.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 c09ecbc..9992bfd 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 8406743..40f651e 100755 # We also update the Registry several times, for firstboot, and (ONLY -- -2.7.4 +1.8.3.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 1868af3..53f367a 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 @@ -112,5 +112,5 @@ index dcbaec2..8e5cf1d 100644 =over 4 -- -2.7.4 +1.8.3.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 aa16f32..1a78327 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 52f73ec..cbaf4f3 100644 /* It's possible in future other formats will support discard, but * currently (qemu 1.7) none of them do. -- -2.7.4 +1.8.3.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 8eb8163..5226c27 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 053cad3..0d723fe 100644 TESTS_ENVIRONMENT = $(top_builddir)/run --test -- -2.7.4 +1.8.3.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 2057653..2d4f370 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 @@ -220,5 +220,5 @@ index 8e5cf1d..5800b34 100644 This option is used to make the output more machine friendly -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0025-p2v-User-can-click-on-an-interface-name-to-identify-.patch b/SOURCES/0025-p2v-User-can-click-on-an-interface-name-to-identify-.patch index 7830bf8..254d8b7 100644 --- a/SOURCES/0025-p2v-User-can-click-on-an-interface-name-to-identify-.patch +++ b/SOURCES/0025-p2v-User-can-click-on-an-interface-name-to-identify-.patch @@ -133,5 +133,5 @@ index a3987f4..3e4ef99 100644 C button: -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0026-p2v-virt-p2v-make-disk-Make-os-version-parameter-opt.patch b/SOURCES/0026-p2v-virt-p2v-make-disk-Make-os-version-parameter-opt.patch index 4840bec..8366416 100644 --- a/SOURCES/0026-p2v-virt-p2v-make-disk-Make-os-version-parameter-opt.patch +++ b/SOURCES/0026-p2v-virt-p2v-make-disk-Make-os-version-parameter-opt.patch @@ -126,5 +126,5 @@ index d401097..79bf499 100644 -drive file=/var/tmp/p2v.img,if=virtio,index=0 \ -drive file=/var/tmp/guest.img,if=virtio,index=1 -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0027-daemon-glob-add-optarg-to-control-trailing-slash-for.patch b/SOURCES/0027-daemon-glob-add-optarg-to-control-trailing-slash-for.patch index d41be75..5d5ef7b 100644 --- a/SOURCES/0027-daemon-glob-add-optarg-to-control-trailing-slash-for.patch +++ b/SOURCES/0027-daemon-glob-add-optarg-to-control-trailing-slash-for.patch @@ -134,5 +134,5 @@ index d4058ac..a5f3f9e 100644 gobject/src/optargs-hivex_open.c gobject/src/optargs-inspect_get_icon.c -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0028-customize-add-globbing-for-delete.patch b/SOURCES/0028-customize-add-globbing-for-delete.patch index 13c151c..4373004 100644 --- a/SOURCES/0028-customize-add-globbing-for-delete.patch +++ b/SOURCES/0028-customize-add-globbing-for-delete.patch @@ -46,5 +46,5 @@ index 63e4246..403bb89 100644 }; -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0029-p2v-tests-Don-t-supply-os-version-in-test.patch b/SOURCES/0029-p2v-tests-Don-t-supply-os-version-in-test.patch index f85cf7f..fab8627 100644 --- a/SOURCES/0029-p2v-tests-Don-t-supply-os-version-in-test.patch +++ b/SOURCES/0029-p2v-tests-Don-t-supply-os-version-in-test.patch @@ -23,5 +23,5 @@ index 17745b2..487e198 100644 test-virt-p2v-pxe.vmlinuz test-virt-p2v-pxe.initramfs: stamp-test-virt-p2v-pxe-kernel -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0030-appliance-Pass-quiet-option-to-kernel-when-verbose.patch b/SOURCES/0030-appliance-Pass-quiet-option-to-kernel-when-verbose.patch index 1e9b212..1694abb 100644 --- a/SOURCES/0030-appliance-Pass-quiet-option-to-kernel-when-verbose.patch +++ b/SOURCES/0030-appliance-Pass-quiet-option-to-kernel-when-verbose.patch @@ -69,5 +69,5 @@ index a4fc987..1bc349a 100644 slen = strlen (sentinel); if (memmem (buf, len, sentinel, slen) != NULL) -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0031-appliance-Quiet-some-warnings-about-missing-files.patch b/SOURCES/0031-appliance-Quiet-some-warnings-about-missing-files.patch index 0e89d2a..00fdb9c 100644 --- a/SOURCES/0031-appliance-Quiet-some-warnings-about-missing-files.patch +++ b/SOURCES/0031-appliance-Quiet-some-warnings-about-missing-files.patch @@ -28,5 +28,5 @@ index ff8f5df..3b76486 100755 # Update the system clock. hwclock -u -s -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0032-appliance-use-bash-features-for-string-matching-in-f.patch b/SOURCES/0032-appliance-use-bash-features-for-string-matching-in-f.patch index e04de9c..46a5c0f 100644 --- a/SOURCES/0032-appliance-use-bash-features-for-string-matching-in-f.patch +++ b/SOURCES/0032-appliance-use-bash-features-for-string-matching-in-f.patch @@ -50,5 +50,5 @@ index 3b76486..fd56033 100755 fi eval `grep -Eo 'guestfs_channel=[^[:space:]]+' /proc/cmdline` -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0033-launch-Factor-out-earlyprintk-from-the-command-line.patch b/SOURCES/0033-launch-Factor-out-earlyprintk-from-the-command-line.patch index 1f398a9..5795ed8 100644 --- a/SOURCES/0033-launch-Factor-out-earlyprintk-from-the-command-line.patch +++ b/SOURCES/0033-launch-Factor-out-earlyprintk-from-the-command-line.patch @@ -44,5 +44,5 @@ index 229069f..40b4810 100644 * currently provide EFI, and if the device is compiled in it * will try to call the EFI function GetTime unconditionally -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0034-launch-direct-Don-t-run-qemu-version.patch b/SOURCES/0034-launch-direct-Don-t-run-qemu-version.patch index 966e89f..c59ab6a 100644 --- a/SOURCES/0034-launch-direct-Don-t-run-qemu-version.patch +++ b/SOURCES/0034-launch-direct-Don-t-run-qemu-version.patch @@ -137,5 +137,5 @@ index cbaf4f3..646f9c6 100644 data->qemu_devices = NULL; -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0035-launch-Remove-guestfs_int_print_timestamped_message-.patch b/SOURCES/0035-launch-Remove-guestfs_int_print_timestamped_message-.patch index 163c070..41b671f 100644 --- a/SOURCES/0035-launch-Remove-guestfs_int_print_timestamped_message-.patch +++ b/SOURCES/0035-launch-Remove-guestfs_int_print_timestamped_message-.patch @@ -246,5 +246,5 @@ index 40b4810..0eb7d18 100644 * Approximately the same as this code: * http://www.mpp.mpg.de/~huber/util/timevaldiff.c -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0036-launch-Add-a-virtio-rng-device-to-the-guest.patch b/SOURCES/0036-launch-Add-a-virtio-rng-device-to-the-guest.patch index 7768db6..25d9c58 100644 --- a/SOURCES/0036-launch-Add-a-virtio-rng-device-to-the-guest.patch +++ b/SOURCES/0036-launch-Add-a-virtio-rng-device-to-the-guest.patch @@ -57,5 +57,5 @@ index ceaa696..3df1833 100644 start_element ("controller") { attribute ("type", "scsi"); -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0037-appliance-When-using-verbose-mode-set-x-in-the-appli.patch b/SOURCES/0037-appliance-When-using-verbose-mode-set-x-in-the-appli.patch index 991fc89..e728121 100644 --- a/SOURCES/0037-appliance-When-using-verbose-mode-set-x-in-the-appli.patch +++ b/SOURCES/0037-appliance-When-using-verbose-mode-set-x-in-the-appli.patch @@ -22,5 +22,5 @@ index fd56033..239b50e 100755 if [[ $cmdline == *guestfs_network=1* ]]; then guestfs_network=1 -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0038-appliance-init-Move-cmdline-parsing-earlier.patch b/SOURCES/0038-appliance-init-Move-cmdline-parsing-earlier.patch index f73f065..a429161 100644 --- a/SOURCES/0038-appliance-init-Move-cmdline-parsing-earlier.patch +++ b/SOURCES/0038-appliance-init-Move-cmdline-parsing-earlier.patch @@ -92,5 +92,5 @@ index 239b50e..55b1a35 100755 cmd="$cmd --channel $guestfs_channel" fi -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0039-appliance-init-Mount-selinuxfs-along-with-other-spec.patch b/SOURCES/0039-appliance-init-Mount-selinuxfs-along-with-other-spec.patch index 513fe91..c65ec3e 100644 --- a/SOURCES/0039-appliance-init-Mount-selinuxfs-along-with-other-spec.patch +++ b/SOURCES/0039-appliance-init-Mount-selinuxfs-along-with-other-spec.patch @@ -38,5 +38,5 @@ index 55b1a35..6793d57 100755 # Increase the SCSI timeout so we can read remote images. shopt -s nullglob -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0040-appliance-init-Don-t-run-hwclock-command.patch b/SOURCES/0040-appliance-init-Don-t-run-hwclock-command.patch index 9b39c1f..cb8fe49 100644 --- a/SOURCES/0040-appliance-init-Don-t-run-hwclock-command.patch +++ b/SOURCES/0040-appliance-init-Don-t-run-hwclock-command.patch @@ -28,5 +28,5 @@ index 6793d57..4407bbb 100755 ip addr add 127.0.0.1/8 brd + dev lo scope host ip link set dev lo up -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0041-conn-Pretend-to-be-a-serial-terminal-so-sgabios-does.patch b/SOURCES/0041-conn-Pretend-to-be-a-serial-terminal-so-sgabios-does.patch index 6c9b83f..000ae21 100644 --- a/SOURCES/0041-conn-Pretend-to-be-a-serial-terminal-so-sgabios-does.patch +++ b/SOURCES/0041-conn-Pretend-to-be-a-serial-terminal-so-sgabios-does.patch @@ -73,5 +73,5 @@ index 9db0bfd..8a4b9d0 100644 return 1; -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0042-tests-qemu-Add-program-for-tracing-and-analyzing-boo.patch b/SOURCES/0042-tests-qemu-Add-program-for-tracing-and-analyzing-boo.patch index 5eb73bf..16e010a 100644 --- a/SOURCES/0042-tests-qemu-Add-program-for-tracing-and-analyzing-boo.patch +++ b/SOURCES/0042-tests-qemu-Add-program-for-tracing-and-analyzing-boo.patch @@ -1707,5 +1707,5 @@ index 0000000..86d403e + +#endif /* GUESTFS_BOOT_ANALYSIS_H_ */ -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0043-rescue-Suggest-using-recursive-bind-mounts.patch b/SOURCES/0043-rescue-Suggest-using-recursive-bind-mounts.patch index 1474bf9..69e3b01 100644 --- a/SOURCES/0043-rescue-Suggest-using-recursive-bind-mounts.patch +++ b/SOURCES/0043-rescue-Suggest-using-recursive-bind-mounts.patch @@ -31,5 +31,5 @@ index 08c8062..16028a7 100644 printf ("\n"); -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0044-rescue-Print-chroot-suggestion-for-Linux-guests.patch b/SOURCES/0044-rescue-Print-chroot-suggestion-for-Linux-guests.patch index fda1b23..3633323 100644 --- a/SOURCES/0044-rescue-Print-chroot-suggestion-for-Linux-guests.patch +++ b/SOURCES/0044-rescue-Print-chroot-suggestion-for-Linux-guests.patch @@ -29,5 +29,5 @@ index 16028a7..982f3c4 100644 printf ("\n"); -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0045-rescue-Fix-test-to-deal-with-new-suggest-output.patch b/SOURCES/0045-rescue-Fix-test-to-deal-with-new-suggest-output.patch index 0b50961..e8b9433 100644 --- a/SOURCES/0045-rescue-Fix-test-to-deal-with-new-suggest-output.patch +++ b/SOURCES/0045-rescue-Fix-test-to-deal-with-new-suggest-output.patch @@ -29,5 +29,5 @@ index e3cb59d..a8b41e2 100755 cat virt-rescue-suggest.out exit 1 -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0046-boot-analysis-Add-memsize-smp-and-append-options.patch b/SOURCES/0046-boot-analysis-Add-memsize-smp-and-append-options.patch index ea6a9f3..b974b4d 100644 --- a/SOURCES/0046-boot-analysis-Add-memsize-smp-and-append-options.patch +++ b/SOURCES/0046-boot-analysis-Add-memsize-smp-and-append-options.patch @@ -154,5 +154,5 @@ index 71b265a..fc2c93b 100644 return g; -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0047-appliance-init-generate-etc-machine-id.patch b/SOURCES/0047-appliance-init-generate-etc-machine-id.patch index 7572715..8acb68a 100644 --- a/SOURCES/0047-appliance-init-generate-etc-machine-id.patch +++ b/SOURCES/0047-appliance-init-generate-etc-machine-id.patch @@ -34,5 +34,5 @@ index 4a04bce..b05c0ed 100755 systemd-tmpfiles --prefix=/dev --create --boot -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0048-launch-direct-Add-a-comment-about-use-of-display-non.patch b/SOURCES/0048-launch-direct-Add-a-comment-about-use-of-display-non.patch index 6596576..95be665 100644 --- a/SOURCES/0048-launch-direct-Add-a-comment-about-use-of-display-non.patch +++ b/SOURCES/0048-launch-direct-Add-a-comment-about-use-of-display-non.patch @@ -23,5 +23,5 @@ index 25c97a7..92b45fd 100644 ADD_CMDLINE ("none"); -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0049-launch-Only-use-sgabios-when-verbose-is-enabled.patch b/SOURCES/0049-launch-Only-use-sgabios-when-verbose-is-enabled.patch index 55f891c..69b53ea 100644 --- a/SOURCES/0049-launch-Only-use-sgabios-when-verbose-is-enabled.patch +++ b/SOURCES/0049-launch-Only-use-sgabios-when-verbose-is-enabled.patch @@ -46,5 +46,5 @@ index 3df1833..f9edac0 100644 } end_element (); -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0050-launch-Add-a-comment-about-why-acpi-off-because-it-s.patch b/SOURCES/0050-launch-Add-a-comment-about-why-acpi-off-because-it-s.patch index 105a25e..29e9e69 100644 --- a/SOURCES/0050-launch-Add-a-comment-about-why-acpi-off-because-it-s.patch +++ b/SOURCES/0050-launch-Add-a-comment-about-why-acpi-off-because-it-s.patch @@ -22,5 +22,5 @@ index 0eb7d18..98eca07 100644 " cgroup_disable=memory" /* saves us about 5 MB of RAM */ "%s" /* root=appliance_dev */ -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0051-docs-Link-to-boot-analysis-program-from-guestfs-perf.patch b/SOURCES/0051-docs-Link-to-boot-analysis-program-from-guestfs-perf.patch index ec1775e..9b00034 100644 --- a/SOURCES/0051-docs-Link-to-boot-analysis-program-from-guestfs-perf.patch +++ b/SOURCES/0051-docs-Link-to-boot-analysis-program-from-guestfs-perf.patch @@ -57,5 +57,5 @@ index 2a7a4a4..4ba6faf 100644 You can attach to the appliance BIOS/kernel using gdb. If you know what you're doing, this can be a useful way to diagnose boot -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0052-tests-qemu-Add-boot-benchmark.patch b/SOURCES/0052-tests-qemu-Add-boot-benchmark.patch index 70a4837..5957442 100644 --- a/SOURCES/0052-tests-qemu-Add-boot-benchmark.patch +++ b/SOURCES/0052-tests-qemu-Add-boot-benchmark.patch @@ -495,5 +495,5 @@ index 0000000..2a6a038 + exit (EXIT_FAILURE); +} -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0053-tests-qemu-boot-analysis-Display-all-times-in-ms.patch b/SOURCES/0053-tests-qemu-boot-analysis-Display-all-times-in-ms.patch index aca95f8..34911fc 100644 --- a/SOURCES/0053-tests-qemu-boot-analysis-Display-all-times-in-ms.patch +++ b/SOURCES/0053-tests-qemu-boot-analysis-Display-all-times-in-ms.patch @@ -46,5 +46,5 @@ index 022eaab..9ab228a 100644 ansi_magenta (); for (j = 0; j < last_free_column; ++j) { -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0054-tests-qemu-Standardize-test-info-printed-by-boot-tes.patch b/SOURCES/0054-tests-qemu-Standardize-test-info-printed-by-boot-tes.patch index 2d056f2..1455472 100644 --- a/SOURCES/0054-tests-qemu-Standardize-test-info-printed-by-boot-tes.patch +++ b/SOURCES/0054-tests-qemu-Standardize-test-info-printed-by-boot-tes.patch @@ -181,5 +181,5 @@ index 2a6a038..0508ee9 100644 /* Print the result. */ -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0055-tests-qemu-boot-analysis-Don-t-force-backend-direct.patch b/SOURCES/0055-tests-qemu-boot-analysis-Don-t-force-backend-direct.patch index a5c6c77..27d3194 100644 --- a/SOURCES/0055-tests-qemu-boot-analysis-Don-t-force-backend-direct.patch +++ b/SOURCES/0055-tests-qemu-boot-analysis-Don-t-force-backend-direct.patch @@ -124,5 +124,5 @@ index f4c1d6c..37d8b3c 100644 assert (len == 0 || message[len-1] != '\r'); } -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0056-launch-libvirt-Disable-virtio-rng-in-libvirt-backend.patch b/SOURCES/0056-launch-libvirt-Disable-virtio-rng-in-libvirt-backend.patch index 27ae806..468de1e 100644 --- a/SOURCES/0056-launch-libvirt-Disable-virtio-rng-in-libvirt-backend.patch +++ b/SOURCES/0056-launch-libvirt-Disable-virtio-rng-in-libvirt-backend.patch @@ -37,5 +37,5 @@ index f9edac0..96c5913 100644 /* virtio-scsi controller. */ start_element ("controller") { -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0057-tests-qemu-Don-t-leak-backend-variable-in-boot-analy.patch b/SOURCES/0057-tests-qemu-Don-t-leak-backend-variable-in-boot-analy.patch index 3f5c0b2..134a40d 100644 --- a/SOURCES/0057-tests-qemu-Don-t-leak-backend-variable-in-boot-analy.patch +++ b/SOURCES/0057-tests-qemu-Don-t-leak-backend-variable-in-boot-analy.patch @@ -32,5 +32,5 @@ index bcd470e..4ed2d48 100644 printf ("qemu version: "); fflush (stdout); -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0058-tests-qemu-boot-analysis-Add-support-for-logging-lib.patch b/SOURCES/0058-tests-qemu-boot-analysis-Add-support-for-logging-lib.patch index 36e87e7..555225c 100644 --- a/SOURCES/0058-tests-qemu-boot-analysis-Add-support-for-logging-lib.patch +++ b/SOURCES/0058-tests-qemu-boot-analysis-Add-support-for-logging-lib.patch @@ -349,5 +349,5 @@ index 37d8b3c..2a43976 100644 static void check_pass_data (void) -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0059-tests-qemu-boot-analysis-Don-t-set-LIBVIRT_LOG_FILTE.patch b/SOURCES/0059-tests-qemu-boot-analysis-Don-t-set-LIBVIRT_LOG_FILTE.patch index 3d38fa7..e665855 100644 --- a/SOURCES/0059-tests-qemu-boot-analysis-Don-t-set-LIBVIRT_LOG_FILTE.patch +++ b/SOURCES/0059-tests-qemu-boot-analysis-Don-t-set-LIBVIRT_LOG_FILTE.patch @@ -27,5 +27,5 @@ index 2a43976..444226c 100644 "1:file:/dev/fd/%d", libvirt_pipe[1]); setenv ("LIBVIRT_LOG_OUTPUTS", log_outputs, 1); -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0060-p2v-Allow-p2v-kernel-options-to-override-GUI-configu.patch b/SOURCES/0060-p2v-Allow-p2v-kernel-options-to-override-GUI-configu.patch index 954f77a..e14721b 100644 --- a/SOURCES/0060-p2v-Allow-p2v-kernel-options-to-override-GUI-configu.patch +++ b/SOURCES/0060-p2v-Allow-p2v-kernel-options-to-override-GUI-configu.patch @@ -224,5 +224,5 @@ index bdd51d3..9629a05 100755 grep "^port.*123" $out grep "^username.*user" $out -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0061-tests-boot-analysis-Add-text-to-describe-how-to-chan.patch b/SOURCES/0061-tests-boot-analysis-Add-text-to-describe-how-to-chan.patch index d99515b..014d635 100644 --- a/SOURCES/0061-tests-boot-analysis-Add-text-to-describe-how-to-chan.patch +++ b/SOURCES/0061-tests-boot-analysis-Add-text-to-describe-how-to-chan.patch @@ -42,5 +42,5 @@ index 4ed2d48..693b6f4 100644 + guestfs_get_append (g) ? : ""); } -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0062-tests-Add-boot-benchmark-range-script.patch b/SOURCES/0062-tests-Add-boot-benchmark-range-script.patch index 1605a3d..6f6500c 100644 --- a/SOURCES/0062-tests-Add-boot-benchmark-range-script.patch +++ b/SOURCES/0062-tests-Add-boot-benchmark-range-script.patch @@ -285,5 +285,5 @@ index 0000000..0e31c4d + +Copyright (C) 2016 Red Hat Inc. -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0063-v2v-Move-target_bus_assignment-to-separate-module.patch b/SOURCES/0063-v2v-Move-target_bus_assignment-to-separate-module.patch index 34d4c57..d564406 100644 --- a/SOURCES/0063-v2v-Move-target_bus_assignment-to-separate-module.patch +++ b/SOURCES/0063-v2v-Move-target_bus_assignment-to-separate-module.patch @@ -273,5 +273,5 @@ index c73482b..f2f1cff 100644 and preserve_overlays overlays src_name = let overlay_dir = (open_guestfs ())#get_cachedir () in -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0064-v2v-Assert-fail-if-we-overwrite-an-existing-disk-in-.patch b/SOURCES/0064-v2v-Assert-fail-if-we-overwrite-an-existing-disk-in-.patch index 0b3324a..2ff5502 100644 --- a/SOURCES/0064-v2v-Assert-fail-if-we-overwrite-an-existing-disk-in-.patch +++ b/SOURCES/0064-v2v-Assert-fail-if-we-overwrite-an-existing-disk-in-.patch @@ -26,5 +26,5 @@ index b82915b..eb3ed58 100644 (* Insert a slot into the bus, but if the desired slot is not empty, then -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0065-v2v-target_bus_assignment-Various-refactorings.patch b/SOURCES/0065-v2v-target_bus_assignment-Various-refactorings.patch index d5b567a..62689cd 100644 --- a/SOURCES/0065-v2v-target_bus_assignment-Various-refactorings.patch +++ b/SOURCES/0065-v2v-target_bus_assignment-Various-refactorings.patch @@ -79,5 +79,5 @@ index eb3ed58..0546004 100644 +(* Return true if slot i is empty in the bus. *) +and slot_is_empty bus i = i >= Array.length !bus || !bus.(i) = BusSlotEmpty -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0066-v2v-target_bus_assignment-Assign-removables-with-slo.patch b/SOURCES/0066-v2v-target_bus_assignment-Assign-removables-with-slo.patch index 7200509..73d905f 100644 --- a/SOURCES/0066-v2v-target_bus_assignment-Assign-removables-with-slo.patch +++ b/SOURCES/0066-v2v-target_bus_assignment-Assign-removables-with-slo.patch @@ -99,5 +99,5 @@ index 0546004..5ad8582 100644 { target_virtio_blk_bus = !virtio_blk_bus; target_ide_bus = !ide_bus; -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0067-tests-Add-tests-qemu-boot-benchmark-range.pl-to-EXTR.patch b/SOURCES/0067-tests-Add-tests-qemu-boot-benchmark-range.pl-to-EXTR.patch index 54b7ab0..91ab11a 100644 --- a/SOURCES/0067-tests-Add-tests-qemu-boot-benchmark-range.pl-to-EXTR.patch +++ b/SOURCES/0067-tests-Add-tests-qemu-boot-benchmark-range.pl-to-EXTR.patch @@ -23,5 +23,5 @@ index fdf643f..f2171cd 100644 qemu-speed-test.c -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0068-tests-qemu-boot-analysis-Add-analysis-of-initcalls-b.patch b/SOURCES/0068-tests-qemu-boot-analysis-Add-analysis-of-initcalls-b.patch index ecb662d..4f83085 100644 --- a/SOURCES/0068-tests-qemu-boot-analysis-Add-analysis-of-initcalls-b.patch +++ b/SOURCES/0068-tests-qemu-boot-analysis-Add-analysis-of-initcalls-b.patch @@ -28,5 +28,5 @@ index d35fb49..1c57d05 100644 FIND ("supermin:mini-initrd", 0, data->events[j].source == GUESTFS_EVENT_APPLIANCE && -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0069-tests-qemu-boot-analysis-Port-this-program-to-aarch6.patch b/SOURCES/0069-tests-qemu-boot-analysis-Port-this-program-to-aarch6.patch index 2ecffca..ac1523f 100644 --- a/SOURCES/0069-tests-qemu-boot-analysis-Port-this-program-to-aarch6.patch +++ b/SOURCES/0069-tests-qemu-boot-analysis-Port-this-program-to-aarch6.patch @@ -132,5 +132,5 @@ index 444226c..ace4653 100644 run_test (); } -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0070-v2v-OVF-Better-mapping-for-inspection-data-to-vmtype.patch b/SOURCES/0070-v2v-OVF-Better-mapping-for-inspection-data-to-vmtype.patch index cc747bb..fc9c868 100644 --- a/SOURCES/0070-v2v-OVF-Better-mapping-for-inspection-data-to-vmtype.patch +++ b/SOURCES/0070-v2v-OVF-Better-mapping-for-inspection-data-to-vmtype.patch @@ -104,5 +104,5 @@ index 8dc3fea..f1d8de5 100644 (* Determine the ovf:OperatingSystemSection_Type from libguestfs -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0071-launch-Disable-USB-in-the-appliance.patch b/SOURCES/0071-launch-Disable-USB-in-the-appliance.patch index 2326b77..09b9d83 100644 --- a/SOURCES/0071-launch-Disable-USB-in-the-appliance.patch +++ b/SOURCES/0071-launch-Disable-USB-in-the-appliance.patch @@ -24,5 +24,5 @@ index 98eca07..9f5b14f 100644 " %s" /* selinux */ " %s" /* quiet/verbose */ -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0072-launch-libvirt-Add-a-dev-urandom-based-virtio-rng-de.patch b/SOURCES/0072-launch-libvirt-Add-a-dev-urandom-based-virtio-rng-de.patch index bd0b2ee..7bdc845 100644 --- a/SOURCES/0072-launch-libvirt-Add-a-dev-urandom-based-virtio-rng-de.patch +++ b/SOURCES/0072-launch-libvirt-Add-a-dev-urandom-based-virtio-rng-de.patch @@ -59,5 +59,5 @@ index 96c5913..4c29409 100644 /* virtio-scsi controller. */ start_element ("controller") { -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0073-launch-Don-t-initialize-all-UARTs-serial-ports.patch b/SOURCES/0073-launch-Don-t-initialize-all-UARTs-serial-ports.patch index 59fe27f..a3a134b 100644 --- a/SOURCES/0073-launch-Don-t-initialize-all-UARTs-serial-ports.patch +++ b/SOURCES/0073-launch-Don-t-initialize-all-UARTs-serial-ports.patch @@ -24,5 +24,5 @@ index 9f5b14f..04b0e94 100644 " %s" /* selinux */ " %s" /* quiet/verbose */ -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0074-appliance-Add-pciutils-to-the-appliance.patch b/SOURCES/0074-appliance-Add-pciutils-to-the-appliance.patch index 905f116..539652d 100644 --- a/SOURCES/0074-appliance-Add-pciutils-to-the-appliance.patch +++ b/SOURCES/0074-appliance-Add-pciutils-to-the-appliance.patch @@ -24,5 +24,5 @@ index e93e5e8..6349922 100644 procps-ng psmisc -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0075-tests-qemu-boot-analysis-Dump-pass-data-times-in-ms-.patch b/SOURCES/0075-tests-qemu-boot-analysis-Dump-pass-data-times-in-ms-.patch index 11d2ebe..4efbe60 100644 --- a/SOURCES/0075-tests-qemu-boot-analysis-Dump-pass-data-times-in-ms-.patch +++ b/SOURCES/0075-tests-qemu-boot-analysis-Dump-pass-data-times-in-ms-.patch @@ -41,5 +41,5 @@ index ace4653..a203f94 100644 printf ("\"\n"); } -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0076-tests-qemu-boot-analysis-Display-libvirt-as-distinct.patch b/SOURCES/0076-tests-qemu-boot-analysis-Display-libvirt-as-distinct.patch index 5a7a4b8..6173437 100644 --- a/SOURCES/0076-tests-qemu-boot-analysis-Display-libvirt-as-distinct.patch +++ b/SOURCES/0076-tests-qemu-boot-analysis-Display-libvirt-as-distinct.patch @@ -91,5 +91,5 @@ index 86d403e..a07f12e 100644 struct timespec t; uint64_t source; -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0077-launch-Add-cryptomgr.notests-to-the-appliance-comman.patch b/SOURCES/0077-launch-Add-cryptomgr.notests-to-the-appliance-comman.patch index 9a29ed4..feadbd8 100644 --- a/SOURCES/0077-launch-Add-cryptomgr.notests-to-the-appliance-comman.patch +++ b/SOURCES/0077-launch-Add-cryptomgr.notests-to-the-appliance-comman.patch @@ -23,5 +23,5 @@ index 04b0e94..e7cb325 100644 "%s" /* root=appliance_dev */ " %s" /* selinux */ -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0078-utils-Move-tests-qemu-boot-analysis-etc-tools-to-new.patch b/SOURCES/0078-utils-Move-tests-qemu-boot-analysis-etc-tools-to-new.patch index 4965b95..351ace5 100644 --- a/SOURCES/0078-utils-Move-tests-qemu-boot-analysis-etc-tools-to-new.patch +++ b/SOURCES/0078-utils-Move-tests-qemu-boot-analysis-etc-tools-to-new.patch @@ -7325,5 +7325,5 @@ index 0000000..d5e34c3 + unlink (tmpfile); +} -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0079-utils-boot-analysis-utils-boot-benchmark-Add-manual-.patch b/SOURCES/0079-utils-boot-analysis-utils-boot-benchmark-Add-manual-.patch index c54950e..5de75e7 100644 --- a/SOURCES/0079-utils-boot-analysis-utils-boot-benchmark-Add-manual-.patch +++ b/SOURCES/0079-utils-boot-analysis-utils-boot-benchmark-Add-manual-.patch @@ -352,5 +352,5 @@ index 0000000..b34546a + +Copyright (C) 2016 Red Hat Inc. -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0080-utils-Add-a-README-file-describing-briefly-the-purpo.patch b/SOURCES/0080-utils-Add-a-README-file-describing-briefly-the-purpo.patch index 02c7eb4..135a0e3 100644 --- a/SOURCES/0080-utils-Add-a-README-file-describing-briefly-the-purpo.patch +++ b/SOURCES/0080-utils-Add-a-README-file-describing-briefly-the-purpo.patch @@ -28,5 +28,5 @@ index 0000000..ceaaadd + +For an overview of libguestfs directories, see guestfs-hacking(1). -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0081-utils-Add-README-to-EXTRA_DIST.patch b/SOURCES/0081-utils-Add-README-to-EXTRA_DIST.patch index c7a98a7..d717d51 100644 --- a/SOURCES/0081-utils-Add-README-to-EXTRA_DIST.patch +++ b/SOURCES/0081-utils-Add-README-to-EXTRA_DIST.patch @@ -24,5 +24,5 @@ index 079aa7d..5be6876 100644 website/bugs.png \ website/communicate.png \ -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0082-utils-boot-analysis-Fix-minor-typo-in-string.patch b/SOURCES/0082-utils-boot-analysis-Fix-minor-typo-in-string.patch index 8374d7a..c6e7284 100644 --- a/SOURCES/0082-utils-boot-analysis-Fix-minor-typo-in-string.patch +++ b/SOURCES/0082-utils-boot-analysis-Fix-minor-typo-in-string.patch @@ -22,5 +22,5 @@ index 693b6f4..4308bea 100644 printf (" qemu: %-20s [to change set $LIBGUESTFS_HV]\n", qemu); printf ("qemu version: "); -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0083-boot-analysis-Make-ftrace-optional-in-the-timeline.patch b/SOURCES/0083-boot-analysis-Make-ftrace-optional-in-the-timeline.patch index 1f381eb..66c61de 100644 --- a/SOURCES/0083-boot-analysis-Make-ftrace-optional-in-the-timeline.patch +++ b/SOURCES/0083-boot-analysis-Make-ftrace-optional-in-the-timeline.patch @@ -25,5 +25,5 @@ index 09a78ef..905d1e3 100644 strstr (data->events[j].message, "ftrace: allocating"), 1); -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0084-boot-analysis-Flush-out-debug-data-after-printing-it.patch b/SOURCES/0084-boot-analysis-Flush-out-debug-data-after-printing-it.patch index 8cf5c8a..b0a60e1 100644 --- a/SOURCES/0084-boot-analysis-Flush-out-debug-data-after-printing-it.patch +++ b/SOURCES/0084-boot-analysis-Flush-out-debug-data-after-printing-it.patch @@ -34,5 +34,5 @@ index 461c69e..3d38fe2 100644 static void -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0085-Revert-appliance-init-run-ldconfig.patch b/SOURCES/0085-Revert-appliance-init-run-ldconfig.patch index c647664..26801c3 100644 --- a/SOURCES/0085-Revert-appliance-init-run-ldconfig.patch +++ b/SOURCES/0085-Revert-appliance-init-run-ldconfig.patch @@ -32,5 +32,5 @@ index b05c0ed..d168b5e 100755 for d in /lib64 /lib; do f=$d/libSegFault.so -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0086-appliance-Copy-etc-ld.so.cache-from-the-host-into-th.patch b/SOURCES/0086-appliance-Copy-etc-ld.so.cache-from-the-host-into-th.patch index 6feddef..3fa0a3a 100644 --- a/SOURCES/0086-appliance-Copy-etc-ld.so.cache-from-the-host-into-th.patch +++ b/SOURCES/0086-appliance-Copy-etc-ld.so.cache-from-the-host-into-th.patch @@ -34,5 +34,5 @@ index 8ff53b5..268d712 100644 /lib/lsb/* /usr/share/augeas/lenses/*.aug -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0087-utils-boot-analysis-Make-handling-of-first-kernel-me.patch b/SOURCES/0087-utils-boot-analysis-Make-handling-of-first-kernel-me.patch index 75c6380..aa78e1d 100644 --- a/SOURCES/0087-utils-boot-analysis-Make-handling-of-first-kernel-me.patch +++ b/SOURCES/0087-utils-boot-analysis-Make-handling-of-first-kernel-me.patch @@ -104,5 +104,5 @@ index 905d1e3..a4b71a1 100644 #if defined(__i386__) || defined(__x86_64__) /* Alternatives patching instructions (XXX not very accurate we -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0088-utils-boot-analysis-Add-magic-asserts-to-some-struct.patch b/SOURCES/0088-utils-boot-analysis-Add-magic-asserts-to-some-struct.patch index cebb5bd..d0afac3 100644 --- a/SOURCES/0088-utils-boot-analysis-Add-magic-asserts-to-some-struct.patch +++ b/SOURCES/0088-utils-boot-analysis-Add-magic-asserts-to-some-struct.patch @@ -93,5 +93,5 @@ index a07f12e..38cd339 100644 int flags; #define LONG_ACTIVITY 1 /* Expected to take a long time. */ -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0089-utils-boot-analysis-Avoid-overflow-when-comparing-la.patch b/SOURCES/0089-utils-boot-analysis-Avoid-overflow-when-comparing-la.patch index 154fffe..33459f2 100644 --- a/SOURCES/0089-utils-boot-analysis-Avoid-overflow-when-comparing-la.patch +++ b/SOURCES/0089-utils-boot-analysis-Avoid-overflow-when-comparing-la.patch @@ -32,5 +32,5 @@ index 3690ed4..d06d9a1 100644 static void -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0090-appliance-Reenable-ACPI.patch b/SOURCES/0090-appliance-Reenable-ACPI.patch index 842ef65..b460467 100644 --- a/SOURCES/0090-appliance-Reenable-ACPI.patch +++ b/SOURCES/0090-appliance-Reenable-ACPI.patch @@ -31,5 +31,5 @@ index e7cb325..269eeca 100644 " cgroup_disable=memory" /* saves us about 5 MB of RAM */ " usbcore.nousb" /* disable USB, only saves about 1ms */ -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0091-appliance-Find-udevd-a-bit-faster.patch b/SOURCES/0091-appliance-Find-udevd-a-bit-faster.patch index 6bc3ed3..20b0925 100644 --- a/SOURCES/0091-appliance-Find-udevd-a-bit-faster.patch +++ b/SOURCES/0091-appliance-Find-udevd-a-bit-faster.patch @@ -34,5 +34,5 @@ index d168b5e..1f38a0e 100755 $UDEVD --daemon #--debug -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0092-utils-boot-analysis-Make-insmod-message-handling-a-b.patch b/SOURCES/0092-utils-boot-analysis-Make-insmod-message-handling-a-b.patch index 94659e0..1952b77 100644 --- a/SOURCES/0092-utils-boot-analysis-Make-insmod-message-handling-a-b.patch +++ b/SOURCES/0092-utils-boot-analysis-Make-insmod-message-handling-a-b.patch @@ -37,5 +37,5 @@ index a4b71a1..8198c56 100644 } -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0093-v2v-handle-subfolders-in-ova-files.patch b/SOURCES/0093-v2v-handle-subfolders-in-ova-files.patch index 765488a..a4bb5a0 100644 --- a/SOURCES/0093-v2v-handle-subfolders-in-ova-files.patch +++ b/SOURCES/0093-v2v-handle-subfolders-in-ova-files.patch @@ -308,5 +308,5 @@ index 0000000..a590fcc + +rm -rf $d -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0094-v2v-Add-test-v2v-i-ova-subfolders-test-files-to-EXTR.patch b/SOURCES/0094-v2v-Add-test-v2v-i-ova-subfolders-test-files-to-EXTR.patch index 8e374ad..6436599 100644 --- a/SOURCES/0094-v2v-Add-test-v2v-i-ova-subfolders-test-files-to-EXTR.patch +++ b/SOURCES/0094-v2v-Add-test-v2v-i-ova-subfolders-test-files-to-EXTR.patch @@ -24,5 +24,5 @@ index 8354560..5d0ce95 100644 test-v2v-i-ova-two-disks.ovf \ test-v2v-networks-and-bridges-expected.xml \ -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0095-p2v-Add-xterm-to-the-virt-p2v-ISO.patch b/SOURCES/0095-p2v-Add-xterm-to-the-virt-p2v-ISO.patch index 1170ffa..01f339f 100644 --- a/SOURCES/0095-p2v-Add-xterm-to-the-virt-p2v-ISO.patch +++ b/SOURCES/0095-p2v-Add-xterm-to-the-virt-p2v-ISO.patch @@ -51,5 +51,5 @@ index 7acccaa..6cf2961 100644 dejavu-fonts NetworkManager -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0096-p2v-Add-verbose-option-to-virt-p2v-make-disk-kicksta.patch b/SOURCES/0096-p2v-Add-verbose-option-to-virt-p2v-make-disk-kicksta.patch index 0dd7841..d0b5333 100644 --- a/SOURCES/0096-p2v-Add-verbose-option-to-virt-p2v-make-disk-kicksta.patch +++ b/SOURCES/0096-p2v-Add-verbose-option-to-virt-p2v-make-disk-kicksta.patch @@ -135,5 +135,5 @@ index 6e65c07..cea3787 100644 =item B<--version> -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0097-mllib-Add-bindings-for-makedev-3-major-3-and-minor-3.patch b/SOURCES/0097-mllib-Add-bindings-for-makedev-3-major-3-and-minor-3.patch index cb1ace3..5898e8b 100644 --- a/SOURCES/0097-mllib-Add-bindings-for-makedev-3-major-3-and-minor-3.patch +++ b/SOURCES/0097-mllib-Add-bindings-for-makedev-3-major-3-and-minor-3.patch @@ -188,5 +188,5 @@ index b7f3cc2..2b9bba1 100644 mllib/guestfs_config.ml mllib/libdir.ml -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0098-mllib-Add-Common_utils.is_partition-function.patch b/SOURCES/0098-mllib-Add-Common_utils.is_partition-function.patch index abf2397..932e336 100644 --- a/SOURCES/0098-mllib-Add-Common_utils.is_partition-function.patch +++ b/SOURCES/0098-mllib-Add-Common_utils.is_partition-function.patch @@ -247,5 +247,5 @@ index 5d0ce95..5bffbfe 100644 $(top_builddir)/mllib/regedit.cmo \ stringMap.cmo \ -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0099-builder-Warn-if-output-is-a-host-partition-RHBZ-1342.patch b/SOURCES/0099-builder-Warn-if-output-is-a-host-partition-RHBZ-1342.patch index 7779356..23fa2d8 100644 --- a/SOURCES/0099-builder-Warn-if-output-is-a-host-partition-RHBZ-1342.patch +++ b/SOURCES/0099-builder-Warn-if-output-is-a-host-partition-RHBZ-1342.patch @@ -121,5 +121,5 @@ index 545b134..94ba430 100644 =item B<--verbose> -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0100-p2v-Add-XTerm-button-which-launches-a-terminal-windo.patch b/SOURCES/0100-p2v-Add-XTerm-button-which-launches-a-terminal-windo.patch index 3624cda..df53afd 100644 --- a/SOURCES/0100-p2v-Add-XTerm-button-which-launches-a-terminal-windo.patch +++ b/SOURCES/0100-p2v-Add-XTerm-button-which-launches-a-terminal-windo.patch @@ -77,5 +77,5 @@ index 015fa21..b8d61b5 100644 about_button_clicked (GtkWidget *w, gpointer data) { -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0101-p2v-Place-conversion-server-name-and-port-side-by-si.patch b/SOURCES/0101-p2v-Place-conversion-server-name-and-port-side-by-si.patch index eeca105..f517476 100644 --- a/SOURCES/0101-p2v-Place-conversion-server-name-and-port-side-by-si.patch +++ b/SOURCES/0101-p2v-Place-conversion-server-name-and-port-side-by-si.patch @@ -134,5 +134,5 @@ index 3e4ef99..5ceafa7 100644 │ User name: [root_____________________________] │ │ │ -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0102-mllib-Fix-other-places-where-Dev_t-module-must-be-li.patch b/SOURCES/0102-mllib-Fix-other-places-where-Dev_t-module-must-be-li.patch index 5889a0a..9b5c3ef 100644 --- a/SOURCES/0102-mllib-Fix-other-places-where-Dev_t-module-must-be-li.patch +++ b/SOURCES/0102-mllib-Fix-other-places-where-Dev_t-module-must-be-li.patch @@ -56,5 +56,5 @@ index a3c980a..cba5b41 100644 v2v_test_harness.cmi: $(top_builddir)/ocaml/guestfs.cmi -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0103-p2v-Add-more-authors-who-have-worked-on-virt-v2v-and.patch b/SOURCES/0103-p2v-Add-more-authors-who-have-worked-on-virt-v2v-and.patch index 3a71201..be701fc 100644 --- a/SOURCES/0103-p2v-Add-more-authors-who-have-worked-on-virt-v2v-and.patch +++ b/SOURCES/0103-p2v-Add-more-authors-who-have-worked-on-virt-v2v-and.patch @@ -42,5 +42,5 @@ index c6a4235..88f48f9 100644 "Pino Toscano", "Ming Xie", -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0104-customize-Add-uninstall-operation-RHBZ-1343375.patch b/SOURCES/0104-customize-Add-uninstall-operation-RHBZ-1343375.patch index 27df577..9308f80 100644 --- a/SOURCES/0104-customize-Add-uninstall-operation-RHBZ-1343375.patch +++ b/SOURCES/0104-customize-Add-uninstall-operation-RHBZ-1343375.patch @@ -99,5 +99,5 @@ index 403bb89..8caf2b5 100644 { op_name = "upload"; -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0105-p2v-Print-full-curl-error-when-failing-to-fetch-SSH-.patch b/SOURCES/0105-p2v-Print-full-curl-error-when-failing-to-fetch-SSH-.patch index 8274c41..26fae55 100644 --- a/SOURCES/0105-p2v-Print-full-curl-error-when-failing-to-fetch-SSH-.patch +++ b/SOURCES/0105-p2v-Print-full-curl-error-when-failing-to-fetch-SSH-.patch @@ -77,5 +77,5 @@ index c4d7e2e..ce2b17b 100644 } -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0106-mllib-Use-Unix.F_OK-instead-of-plain-F_OK.patch b/SOURCES/0106-mllib-Use-Unix.F_OK-instead-of-plain-F_OK.patch index 6459f59..4401fd7 100644 --- a/SOURCES/0106-mllib-Use-Unix.F_OK-instead-of-plain-F_OK.patch +++ b/SOURCES/0106-mllib-Use-Unix.F_OK-instead-of-plain-F_OK.patch @@ -29,5 +29,5 @@ index c29dfa0..be8810a 100644 ) with Unix.Unix_error _ -> false -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0107-p2v-ssh-Print-ssh-error-if-user-gives-invalid-conver.patch b/SOURCES/0107-p2v-ssh-Print-ssh-error-if-user-gives-invalid-conver.patch index 580132d..c501800 100644 --- a/SOURCES/0107-p2v-ssh-Print-ssh-error-if-user-gives-invalid-conver.patch +++ b/SOURCES/0107-p2v-ssh-Print-ssh-error-if-user-gives-invalid-conver.patch @@ -83,5 +83,5 @@ index ce2b17b..d9210f3 100644 case MEXP_TIMEOUT: -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0108-p2v-Don-t-allow-password-SSH-identity-URL-fields-to-.patch b/SOURCES/0108-p2v-Don-t-allow-password-SSH-identity-URL-fields-to-.patch index 2a27d77..5e754b1 100644 --- a/SOURCES/0108-p2v-Don-t-allow-password-SSH-identity-URL-fields-to-.patch +++ b/SOURCES/0108-p2v-Don-t-allow-password-SSH-identity-URL-fields-to-.patch @@ -105,5 +105,5 @@ index 832d72a..dad8f6e 100644 static void -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0109-p2v-Disable-the-sudo-button-when-the-username-is-roo.patch b/SOURCES/0109-p2v-Disable-the-sudo-button-when-the-username-is-roo.patch index 49833c3..6c55c30 100644 --- a/SOURCES/0109-p2v-Disable-the-sudo-button-when-the-username-is-roo.patch +++ b/SOURCES/0109-p2v-Disable-the-sudo-button-when-the-username-is-roo.patch @@ -60,5 +60,5 @@ index dad8f6e..93b086a 100644 /** -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0110-p2v-Add-a-dialog-confirming-the-user-really-means-to.patch b/SOURCES/0110-p2v-Add-a-dialog-confirming-the-user-really-means-to.patch index d19c95f..bfdeafb 100644 --- a/SOURCES/0110-p2v-Add-a-dialog-confirming-the-user-really-means-to.patch +++ b/SOURCES/0110-p2v-Add-a-dialog-confirming-the-user-really-means-to.patch @@ -79,5 +79,5 @@ index 93b086a..142d2eb 100644 static void -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0111-virt-tools-Add-common-colours-option.patch b/SOURCES/0111-virt-tools-Add-common-colours-option.patch index a01460e..628b170 100644 --- a/SOURCES/0111-virt-tools-Add-common-colours-option.patch +++ b/SOURCES/0111-virt-tools-Add-common-colours-option.patch @@ -265,5 +265,5 @@ index 5800b34..93f0e77 100644 Write a compressed output file. This is only allowed if the output -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0112-p2v-Use-virt-v2v-colours-option-support-colour-in-th.patch b/SOURCES/0112-p2v-Use-virt-v2v-colours-option-support-colour-in-th.patch index 7d546ec..1520e88 100644 --- a/SOURCES/0112-p2v-Use-virt-v2v-colours-option-support-colour-in-th.patch +++ b/SOURCES/0112-p2v-Use-virt-v2v-colours-option-support-colour-in-th.patch @@ -355,5 +355,5 @@ index d9210f3..266c236 100644 case MEXP_EOF: -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0113-p2v-Use-a-wrapper-script-instead-of-long-virt-v2v-co.patch b/SOURCES/0113-p2v-Use-a-wrapper-script-instead-of-long-virt-v2v-co.patch index 22a44db..416debf 100644 --- a/SOURCES/0113-p2v-Use-a-wrapper-script-instead-of-long-virt-v2v-co.patch +++ b/SOURCES/0113-p2v-Use-a-wrapper-script-instead-of-long-virt-v2v-co.patch @@ -380,5 +380,5 @@ index 5ceafa7..0c233c5 100644 Output from the virt-v2v command (messages, debugging etc) is saved both in the log file on the conversion server, and sent over the -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0114-p2v-Don-t-display-debugging-messages-in-the-run-dial.patch b/SOURCES/0114-p2v-Don-t-display-debugging-messages-in-the-run-dial.patch index 3eb8413..e7cc555 100644 --- a/SOURCES/0114-p2v-Don-t-display-debugging-messages-in-the-run-dial.patch +++ b/SOURCES/0114-p2v-Don-t-display-debugging-messages-in-the-run-dial.patch @@ -117,5 +117,5 @@ index 0c233c5..b996541 100644 =head1 SEE ALSO -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0115-p2v-Use-a-monospace-font-for-the-run-dialog.patch b/SOURCES/0115-p2v-Use-a-monospace-font-for-the-run-dialog.patch index 65acf0a..462a626 100644 --- a/SOURCES/0115-p2v-Use-a-monospace-font-for-the-run-dialog.patch +++ b/SOURCES/0115-p2v-Use-a-monospace-font-for-the-run-dialog.patch @@ -34,5 +34,5 @@ index a3b4af9..764b0f8 100644 gtk_misc_set_alignment (GTK_MISC (log_label), 0., 0.5); gtk_misc_set_padding (GTK_MISC (log_label), 10, 10); -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0116-p2v-Display-up-to-50-lines-of-the-virt-v2v-conversio.patch b/SOURCES/0116-p2v-Display-up-to-50-lines-of-the-virt-v2v-conversio.patch index 8563be9..6c68815 100644 --- a/SOURCES/0116-p2v-Display-up-to-50-lines-of-the-virt-v2v-conversio.patch +++ b/SOURCES/0116-p2v-Display-up-to-50-lines-of-the-virt-v2v-conversio.patch @@ -53,5 +53,5 @@ index a7d1f11..fe18b4a 100644 fclose (fp); -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0117-p2v-Don-t-display-libvirt-XML-and-wrapper-script-on-.patch b/SOURCES/0117-p2v-Don-t-display-libvirt-XML-and-wrapper-script-on-.patch index e62739d..7cf280a 100644 --- a/SOURCES/0117-p2v-Don-t-display-libvirt-XML-and-wrapper-script-on-.patch +++ b/SOURCES/0117-p2v-Don-t-display-libvirt-XML-and-wrapper-script-on-.patch @@ -34,5 +34,5 @@ index fe18b4a..b54f971 100644 guestfs_int_program_name, wrapper_script); #endif -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0118-p2v-Poll-to-make-Cancel-Conversion-button-more-respo.patch b/SOURCES/0118-p2v-Poll-to-make-Cancel-Conversion-button-more-respo.patch index f281597..f6b2c00 100644 --- a/SOURCES/0118-p2v-Poll-to-make-Cancel-Conversion-button-more-respo.patch +++ b/SOURCES/0118-p2v-Poll-to-make-Cancel-Conversion-button-more-respo.patch @@ -68,5 +68,5 @@ index b54f971..de2a4b2 100644 /* See comment about this in miniexpect.c. */ if (errno == EIO) -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0119-p2v-Gtk-3-workaround-for-RHEL-7.patch b/SOURCES/0119-p2v-Gtk-3-workaround-for-RHEL-7.patch index ce23929..9acd3c4 100644 --- a/SOURCES/0119-p2v-Gtk-3-workaround-for-RHEL-7.patch +++ b/SOURCES/0119-p2v-Gtk-3-workaround-for-RHEL-7.patch @@ -30,5 +30,5 @@ index 764b0f8..7414037 100644 #endif -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0120-RHEL-7-v2v-Remove-dcpath-option-from-manual-page-RHB.patch b/SOURCES/0120-RHEL-7-v2v-Remove-dcpath-option-from-manual-page-RHB.patch index 028e487..32ece16 100644 --- a/SOURCES/0120-RHEL-7-v2v-Remove-dcpath-option-from-manual-page-RHB.patch +++ b/SOURCES/0120-RHEL-7-v2v-Remove-dcpath-option-from-manual-page-RHB.patch @@ -34,5 +34,5 @@ index 93f0e77..4ea02ab 100644 Debug garbage collection and memory allocation. This is only useful -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0121-v2v-Fix-conversion-of-floppy-removable-devices-RHBZ-.patch b/SOURCES/0121-v2v-Fix-conversion-of-floppy-removable-devices-RHBZ-.patch index b3afd03..a6503fa 100644 --- a/SOURCES/0121-v2v-Fix-conversion-of-floppy-removable-devices-RHBZ-.patch +++ b/SOURCES/0121-v2v-Fix-conversion-of-floppy-removable-devices-RHBZ-.patch @@ -199,5 +199,5 @@ index 18ac138..c1cb245 100644 *) -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0122-v2v-Add-a-regression-test-for-floppy-assignment-RHBZ.patch b/SOURCES/0122-v2v-Add-a-regression-test-for-floppy-assignment-RHBZ.patch index 4fbc1b9..7c4e501 100644 --- a/SOURCES/0122-v2v-Add-a-regression-test-for-floppy-assignment-RHBZ.patch +++ b/SOURCES/0122-v2v-Add-a-regression-test-for-floppy-assignment-RHBZ.patch @@ -182,5 +182,5 @@ index 0000000..41e1bef + + -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0123-p2v-improve-error-message-for-sudo-with-password.patch b/SOURCES/0123-p2v-improve-error-message-for-sudo-with-password.patch index 6531ce3..5e5a84c 100644 --- a/SOURCES/0123-p2v-improve-error-message-for-sudo-with-password.patch +++ b/SOURCES/0123-p2v-improve-error-message-for-sudo-with-password.patch @@ -62,5 +62,5 @@ index a8c762d..f2c849f 100644 mexp_close (h); set_ssh_error ("unexpected end of file waiting virt-v2v --version output"); -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0124-p2v-Force-bash-as-the-remote-shell.patch b/SOURCES/0124-p2v-Force-bash-as-the-remote-shell.patch index 1d0ebe2..5fac537 100644 --- a/SOURCES/0124-p2v-Force-bash-as-the-remote-shell.patch +++ b/SOURCES/0124-p2v-Force-bash-as-the-remote-shell.patch @@ -56,5 +56,5 @@ index f2c849f..d2c8035 100644 mexp_set_timeout (h, 2); -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0125-p2v-Set-LANG-C-in-the-remote-shell-so-we-can-match-o.patch b/SOURCES/0125-p2v-Set-LANG-C-in-the-remote-shell-so-we-can-match-o.patch index 6080db2..2ec43cf 100644 --- a/SOURCES/0125-p2v-Set-LANG-C-in-the-remote-shell-so-we-can-match-o.patch +++ b/SOURCES/0125-p2v-Set-LANG-C-in-the-remote-shell-so-we-can-match-o.patch @@ -35,5 +35,5 @@ index d2c8035..aa070d5 100644 mexp_close (h); return NULL; -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0126-sparsify-Move-statvfs-wrapper-function-to-mllib.patch b/SOURCES/0126-sparsify-Move-statvfs-wrapper-function-to-mllib.patch index 1f582f2..0c3b0f6 100644 --- a/SOURCES/0126-sparsify-Move-statvfs-wrapper-function-to-mllib.patch +++ b/SOURCES/0126-sparsify-Move-statvfs-wrapper-function-to-mllib.patch @@ -298,5 +298,5 @@ index 76bff0b..0000000 - CAMLreturn (rv); -} -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0127-v2v-Move-calculation-of-overlay-directory-to-common-.patch b/SOURCES/0127-v2v-Move-calculation-of-overlay-directory-to-common-.patch index cdb0e1f..4803abd 100644 --- a/SOURCES/0127-v2v-Move-calculation-of-overlay-directory-to-common-.patch +++ b/SOURCES/0127-v2v-Move-calculation-of-overlay-directory-to-common-.patch @@ -38,5 +38,5 @@ index f2f1cff..ebbfa68 100644 fun ov -> let saved_filename = -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0128-v2v-Rename-check_free_space-check_guest_free_space.patch b/SOURCES/0128-v2v-Rename-check_free_space-check_guest_free_space.patch index 230fa83..3ef5b40 100644 --- a/SOURCES/0128-v2v-Rename-check_free_space-check_guest_free_space.patch +++ b/SOURCES/0128-v2v-Rename-check_free_space-check_guest_free_space.patch @@ -31,5 +31,5 @@ index ebbfa68..f3eae43 100644 List.iter ( fun { mp_path = mp; -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0129-v2v-Refuse-to-convert-if-1GB-of-free-space-in-tempor.patch b/SOURCES/0129-v2v-Refuse-to-convert-if-1GB-of-free-space-in-tempor.patch index de22dc1..a09bd9e 100644 --- a/SOURCES/0129-v2v-Refuse-to-convert-if-1GB-of-free-space-in-tempor.patch +++ b/SOURCES/0129-v2v-Refuse-to-convert-if-1GB-of-free-space-in-tempor.patch @@ -140,5 +140,5 @@ index 4ea02ab..c68bcb5 100644 Nothing in virt-v2v inherently needs root access, and it will run just -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0130-p2v-Make-the-sudo-error-message-actionable.patch b/SOURCES/0130-p2v-Make-the-sudo-error-message-actionable.patch index 153b85b..a80330a 100644 --- a/SOURCES/0130-p2v-Make-the-sudo-error-message-actionable.patch +++ b/SOURCES/0130-p2v-Make-the-sudo-error-message-actionable.patch @@ -25,5 +25,5 @@ index aa070d5..083e04e 100644 case MEXP_EOF: -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0131-p2v-ssh-Improve-consistency-of-error-messages.patch b/SOURCES/0131-p2v-ssh-Improve-consistency-of-error-messages.patch index 82fd9f8..08a991b 100644 --- a/SOURCES/0131-p2v-ssh-Improve-consistency-of-error-messages.patch +++ b/SOURCES/0131-p2v-ssh-Improve-consistency-of-error-messages.patch @@ -478,5 +478,5 @@ index 083e04e..93c4c55 100644 } -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0132-inspect-get-windows-drive-letters-for-GPT-disks.patch b/SOURCES/0132-inspect-get-windows-drive-letters-for-GPT-disks.patch index a10d5a2..5cda32c 100644 --- a/SOURCES/0132-inspect-get-windows-drive-letters-for-GPT-disks.patch +++ b/SOURCES/0132-inspect-get-windows-drive-letters-for-GPT-disks.patch @@ -155,5 +155,5 @@ index 7e3ead5..f8717fc 100644 * will return non-NULL even if the file/directory does not exist. * You have to call guestfs_is_file{,_opts} etc. -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0133-p2v-Refactor-into-get_blockdev_size-and-get_blockdev.patch b/SOURCES/0133-p2v-Refactor-into-get_blockdev_size-and-get_blockdev.patch index 5b87792..b0a9675 100644 --- a/SOURCES/0133-p2v-Refactor-into-get_blockdev_size-and-get_blockdev.patch +++ b/SOURCES/0133-p2v-Refactor-into-get_blockdev_size-and-get_blockdev.patch @@ -176,5 +176,5 @@ index 3781a8d..18c2b7c 100644 char * get_if_addr (const char *if_name) -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0134-p2v-Combine-size-model-columns-into-the-device-colum.patch b/SOURCES/0134-p2v-Combine-size-model-columns-into-the-device-colum.patch index 585c49f..b29a794 100644 --- a/SOURCES/0134-p2v-Combine-size-model-columns-into-the-device-colum.patch +++ b/SOURCES/0134-p2v-Combine-size-model-columns-into-the-device-colum.patch @@ -150,5 +150,5 @@ index b996541..032a480 100644 Normally you would want to convert all hard disks. If you want -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0135-p2v-Display-serial-number-of-fixed-disks-RHBZ-855058.patch b/SOURCES/0135-p2v-Display-serial-number-of-fixed-disks-RHBZ-855058.patch index 2f9bbac..e7a8483 100644 --- a/SOURCES/0135-p2v-Display-serial-number-of-fixed-disks-RHBZ-855058.patch +++ b/SOURCES/0135-p2v-Display-serial-number-of-fixed-disks-RHBZ-855058.patch @@ -180,5 +180,5 @@ index 032a480..421925f 100644 Normally you would want to convert all hard disks. If you want -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0136-p2v-Make-the-conversion-dialog-slightly-higher.patch b/SOURCES/0136-p2v-Make-the-conversion-dialog-slightly-higher.patch index f0262a2..cc2ac09 100644 --- a/SOURCES/0136-p2v-Make-the-conversion-dialog-slightly-higher.patch +++ b/SOURCES/0136-p2v-Make-the-conversion-dialog-slightly-higher.patch @@ -24,5 +24,5 @@ index 58e9ea3..5ffe3d8 100644 /* The main dialog area. */ hbox = gtk_hbox_new (TRUE, 1); -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0137-p2v-Fix-timeout-error-when-connecting-to-unresponsiv.patch b/SOURCES/0137-p2v-Fix-timeout-error-when-connecting-to-unresponsiv.patch index 04c4fd4..fa100fe 100644 --- a/SOURCES/0137-p2v-Fix-timeout-error-when-connecting-to-unresponsiv.patch +++ b/SOURCES/0137-p2v-Fix-timeout-error-when-connecting-to-unresponsiv.patch @@ -102,5 +102,5 @@ index 93c4c55..f4adde4 100644 config->password && strlen (config->password) > 0) { CLEANUP_FREE char *ssh_message = NULL; -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0138-p2v-virt-p2v-make-disk-passes-through-no-warn-if-par.patch b/SOURCES/0138-p2v-virt-p2v-make-disk-passes-through-no-warn-if-par.patch index 819dc0e..cd9da22 100644 --- a/SOURCES/0138-p2v-virt-p2v-make-disk-passes-through-no-warn-if-par.patch +++ b/SOURCES/0138-p2v-virt-p2v-make-disk-passes-through-no-warn-if-par.patch @@ -84,5 +84,5 @@ index d5a5db5..2e1bffb 100644 =item B<--output> OUTPUT -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0139-p2v-Add-install-option-to-virt-p2v-make-disk-virt-p2.patch b/SOURCES/0139-p2v-Add-install-option-to-virt-p2v-make-disk-virt-p2.patch index d5ea818..9d5dffa 100644 --- a/SOURCES/0139-p2v-Add-install-option-to-virt-p2v-make-disk-virt-p2.patch +++ b/SOURCES/0139-p2v-Add-install-option-to-virt-p2v-make-disk-virt-p2.patch @@ -169,5 +169,5 @@ index cea3787..7e41c9d 100644 =item B<--output> OUTPUT -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0140-p2v-Add-less-package-to-the-ISO.patch b/SOURCES/0140-p2v-Add-less-package-to-the-ISO.patch index 5e611b2..4560fe8 100644 --- a/SOURCES/0140-p2v-Add-less-package-to-the-ISO.patch +++ b/SOURCES/0140-p2v-Add-less-package-to-the-ISO.patch @@ -81,5 +81,5 @@ index 80d6c92..6acae8c 100644 dejavu-fonts NetworkManager -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0141-p2v-Remove-trailing-n-from-fixed-disks-device-box.patch b/SOURCES/0141-p2v-Remove-trailing-n-from-fixed-disks-device-box.patch index 663b0a8..a858fd8 100644 --- a/SOURCES/0141-p2v-Remove-trailing-n-from-fixed-disks-device-box.patch +++ b/SOURCES/0141-p2v-Remove-trailing-n-from-fixed-disks-device-box.patch @@ -24,5 +24,5 @@ index 5ffe3d8..9e9043a 100644 size_gb ? size_gb : "", model ? model : "", serial ? "s/n " : "", serial ? serial : "") == -1) -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0142-p2v-Add-more-utilities-to-the-virt-p2v-ISO.patch b/SOURCES/0142-p2v-Add-more-utilities-to-the-virt-p2v-ISO.patch index 86b1eb9..64b3f52 100644 --- a/SOURCES/0142-p2v-Add-more-utilities-to-the-virt-p2v-ISO.patch +++ b/SOURCES/0142-p2v-Add-more-utilities-to-the-virt-p2v-ISO.patch @@ -82,5 +82,5 @@ index 6acae8c..d339b2f 100644 xorg-x11-server xf86-video-* -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0143-utils-Move-ansi_-functions-to-header-guestfs-interna.patch b/SOURCES/0143-utils-Move-ansi_-functions-to-header-guestfs-interna.patch index 8d6ca49..afc72c7 100644 --- a/SOURCES/0143-utils-Move-ansi_-functions-to-header-guestfs-interna.patch +++ b/SOURCES/0143-utils-Move-ansi_-functions-to-header-guestfs-interna.patch @@ -176,5 +176,5 @@ index d06d9a1..1b491c4 100644 - fputs ("\033[0m", stdout); -} -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0144-p2v-Colourize-kernel-conversion-status-messages-from.patch b/SOURCES/0144-p2v-Colourize-kernel-conversion-status-messages-from.patch index d5c4a72..fdae05a 100644 --- a/SOURCES/0144-p2v-Colourize-kernel-conversion-status-messages-from.patch +++ b/SOURCES/0144-p2v-Colourize-kernel-conversion-status-messages-from.patch @@ -181,5 +181,5 @@ index 421925f..247acce 100644 This flag is passed to virt-p2v when it is launched inside the -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0145-p2v-Use-scp-to-copy-the-files-to-remote-debugging-di.patch b/SOURCES/0145-p2v-Use-scp-to-copy-the-files-to-remote-debugging-di.patch index 9a02ead..161fbc3 100644 --- a/SOURCES/0145-p2v-Use-scp-to-copy-the-files-to-remote-debugging-di.patch +++ b/SOURCES/0145-p2v-Use-scp-to-copy-the-files-to-remote-debugging-di.patch @@ -845,5 +845,5 @@ index 247acce..ef6a9db 100644 could be a virtual machine, as long as it has sufficient memory and disk space to do the conversion, and as long as the physical machine -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0146-p2v-ssh-Set-cooked-mode-on-the-ssh-session-which-run.patch b/SOURCES/0146-p2v-ssh-Set-cooked-mode-on-the-ssh-session-which-run.patch index f1e5489..952f6c7 100644 --- a/SOURCES/0146-p2v-ssh-Set-cooked-mode-on-the-ssh-session-which-run.patch +++ b/SOURCES/0146-p2v-ssh-Set-cooked-mode-on-the-ssh-session-which-run.patch @@ -68,5 +68,5 @@ index 270f1e5..4cae732 100644 return NULL; -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0147-p2v-Send-C-to-remote-end-to-cancel-the-conversion.patch b/SOURCES/0147-p2v-Send-C-to-remote-end-to-cancel-the-conversion.patch index 4cc314b..52058f1 100644 --- a/SOURCES/0147-p2v-Send-C-to-remote-end-to-cancel-the-conversion.patch +++ b/SOURCES/0147-p2v-Send-C-to-remote-end-to-cancel-the-conversion.patch @@ -143,5 +143,5 @@ index f9b8350..484c0e4 100644 WEXITSTATUS (status)); ret = -1; -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0148-p2v-Remove-the-Enable-debugging-option-v-p2v.debug.patch b/SOURCES/0148-p2v-Remove-the-Enable-debugging-option-v-p2v.debug.patch index 78c555d..d7b417c 100644 --- a/SOURCES/0148-p2v-Remove-the-Enable-debugging-option-v-p2v.debug.patch +++ b/SOURCES/0148-p2v-Remove-the-Enable-debugging-option-v-p2v.debug.patch @@ -306,5 +306,5 @@ index ef6a9db..6532240 100644 =item B<-V> -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0149-p2v-Remove-p2v.debug-option-from-test-command-lines.patch b/SOURCES/0149-p2v-Remove-p2v.debug-option-from-test-command-lines.patch index 47a0867..84f7ed7 100644 --- a/SOURCES/0149-p2v-Remove-p2v.debug-option-from-test-command-lines.patch +++ b/SOURCES/0149-p2v-Remove-p2v.debug-option-from-test-command-lines.patch @@ -38,5 +38,5 @@ index e232d42..d464a46 100755 virt-p2v --cmdline="$cmdline" -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0150-v2v-Fix-documentation-in-place-I-in-place.patch b/SOURCES/0150-v2v-Fix-documentation-in-place-I-in-place.patch index b7e4a4c..ec1348d 100644 --- a/SOURCES/0150-v2v-Fix-documentation-in-place-I-in-place.patch +++ b/SOURCES/0150-v2v-Fix-documentation-in-place-I-in-place.patch @@ -24,5 +24,5 @@ index c68bcb5..9fc0b72 100644 $ df -h "`guestfish get-cachedir`" -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0151-v2v-Add-support-for-Win2016-virtio-drivers.patch b/SOURCES/0151-v2v-Add-support-for-Win2016-virtio-drivers.patch index 606cae4..60862a6 100644 --- a/SOURCES/0151-v2v-Add-support-for-Win2016-virtio-drivers.patch +++ b/SOURCES/0151-v2v-Add-support-for-Win2016-virtio-drivers.patch @@ -28,5 +28,5 @@ index 6237a09..c5d6c91 100644 raise Not_found in -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0152-v2v-Move-augeas_debug_errors-renamed-debug_augeas_er.patch b/SOURCES/0152-v2v-Move-augeas_debug_errors-renamed-debug_augeas_er.patch index a7a5b02..6147cef 100644 --- a/SOURCES/0152-v2v-Move-augeas_debug_errors-renamed-debug_augeas_er.patch +++ b/SOURCES/0152-v2v-Move-augeas_debug_errors-renamed-debug_augeas_er.patch @@ -577,5 +577,5 @@ index cba5b41..5b376f0 100644 $(top_builddir)/v2v/xml.cmo \ $(SOURCES_ML:.ml=.cmo) \ -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0153-New-API-selinux_relabel-SELinux-relabel-parts-of-the.patch b/SOURCES/0153-New-API-selinux_relabel-SELinux-relabel-parts-of-the.patch index bd10583..25ef14b 100644 --- a/SOURCES/0153-New-API-selinux_relabel-SELinux-relabel-parts-of-the.patch +++ b/SOURCES/0153-New-API-selinux_relabel-SELinux-relabel-parts-of-the.patch @@ -246,5 +246,5 @@ index c92ddb6..5873851 100644 -458 +467 -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0154-tests-Add-a-test-of-the-setfiles-API.patch b/SOURCES/0154-tests-Add-a-test-of-the-setfiles-API.patch index 45a7a44..002a21d 100644 --- a/SOURCES/0154-tests-Add-a-test-of-the-setfiles-API.patch +++ b/SOURCES/0154-tests-Add-a-test-of-the-setfiles-API.patch @@ -212,5 +212,5 @@ index 0000000..744d1f5 + +exit ($errors == 0 ? 0 : 1); -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0155-customize-Add-module-for-doing-SELinux-relabel-of-fi.patch b/SOURCES/0155-customize-Add-module-for-doing-SELinux-relabel-of-fi.patch index 7d849e9..ed2b7e9 100644 --- a/SOURCES/0155-customize-Add-module-for-doing-SELinux-relabel-of-fi.patch +++ b/SOURCES/0155-customize-Add-module-for-doing-SELinux-relabel-of-fi.patch @@ -244,5 +244,5 @@ index 46cc324..b689aef 100644 $(top_builddir)/customize/subscription_manager.cmo \ $(top_builddir)/customize/customize_cmdline.cmo \ -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0156-builder-Use-virt-sysprep-selinux-relabel-when-prepar.patch b/SOURCES/0156-builder-Use-virt-sysprep-selinux-relabel-when-prepar.patch index 52474c8..1780dc3 100644 --- a/SOURCES/0156-builder-Use-virt-sysprep-selinux-relabel-when-prepar.patch +++ b/SOURCES/0156-builder-Use-virt-sysprep-selinux-relabel-when-prepar.patch @@ -41,5 +41,5 @@ index bb5500c..1036a60 100644 # Sparsify. mv $output $output.old -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0157-lib-Deprecate-old-SELinux-APIs-rewrite-SELinux-docum.patch b/SOURCES/0157-lib-Deprecate-old-SELinux-APIs-rewrite-SELinux-docum.patch index 4d9121c..679cd7e 100644 --- a/SOURCES/0157-lib-Deprecate-old-SELinux-APIs-rewrite-SELinux-docum.patch +++ b/SOURCES/0157-lib-Deprecate-old-SELinux-APIs-rewrite-SELinux-docum.patch @@ -331,5 +331,5 @@ index f0f241f..7e4620f 100755 $g->launch (); -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0158-v2v-linux-Use-new-SELinux_relabel-module-to-relabel-.patch b/SOURCES/0158-v2v-linux-Use-new-SELinux_relabel-module-to-relabel-.patch index 9acd6b0..eed0fe8 100644 --- a/SOURCES/0158-v2v-linux-Use-new-SELinux_relabel-module-to-relabel-.patch +++ b/SOURCES/0158-v2v-linux-Use-new-SELinux_relabel-module-to-relabel-.patch @@ -58,5 +58,5 @@ index bdbd06b..825dae8 100644 gcaps_block_bus = if virtio then Virtio_blk else IDE; gcaps_net_bus = if virtio then Virtio_net else E1000; -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0159-Revert-p2v-Disable-SELinux-in-virt-p2v-make-disk.patch b/SOURCES/0159-Revert-p2v-Disable-SELinux-in-virt-p2v-make-disk.patch index c76ea8f..2097dc8 100644 --- a/SOURCES/0159-Revert-p2v-Disable-SELinux-in-virt-p2v-make-disk.patch +++ b/SOURCES/0159-Revert-p2v-Disable-SELinux-in-virt-p2v-make-disk.patch @@ -41,5 +41,5 @@ index cc7ee93..a199e1e 100644 --run $tmpdir/post-install " -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0160-mllib-move-which-and-its-exception-from-dib.patch b/SOURCES/0160-mllib-move-which-and-its-exception-from-dib.patch index 6117ca2..bf7f0a4 100644 --- a/SOURCES/0160-mllib-move-which-and-its-exception-from-dib.patch +++ b/SOURCES/0160-mllib-move-which-and-its-exception-from-dib.patch @@ -120,5 +120,5 @@ index c66efa7..8179dde 100644 + + Throw [Executable_not_found] if not available. *) -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0161-mllib-check-for-executable-existance-in-run_command-.patch b/SOURCES/0161-mllib-check-for-executable-existance-in-run_command-.patch index 4ad83c6..e98c062 100644 --- a/SOURCES/0161-mllib-check-for-executable-existance-in-run_command-.patch +++ b/SOURCES/0161-mllib-check-for-executable-existance-in-run_command-.patch @@ -65,5 +65,5 @@ index 7e44029..51449ad 100644 let shell_command ?(echo_cmd = true) cmd = if echo_cmd then -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0162-podcheck-Check-tool-help-output.patch b/SOURCES/0162-podcheck-Check-tool-help-output.patch index ec08a5c..adf88ae 100644 --- a/SOURCES/0162-podcheck-Check-tool-help-output.patch +++ b/SOURCES/0162-podcheck-Check-tool-help-output.patch @@ -31,5 +31,5 @@ index 4441b99..b9a4177 100644 " -v|--verbose Verbose messages\n" " -V|--version Display version and exit\n" -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0163-mllib-move-_exit-from-v2v-as-Exit-module.patch b/SOURCES/0163-mllib-move-_exit-from-v2v-as-Exit-module.patch index f34f834..0299cfd 100644 --- a/SOURCES/0163-mllib-move-_exit-from-v2v-as-Exit-module.patch +++ b/SOURCES/0163-mllib-move-_exit-from-v2v-as-Exit-module.patch @@ -262,5 +262,5 @@ index 07cf6fb..53c0bc3 100644 (* Parent. *) -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0164-dib-rework-run-of-extra-data.d-hooks-RHBZ-1362354.patch b/SOURCES/0164-dib-rework-run-of-extra-data.d-hooks-RHBZ-1362354.patch index 16ee419..748aa31 100644 --- a/SOURCES/0164-dib-rework-run-of-extra-data.d-hooks-RHBZ-1362354.patch +++ b/SOURCES/0164-dib-rework-run-of-extra-data.d-hooks-RHBZ-1362354.patch @@ -316,5 +316,5 @@ index 8ccb9f5..41e7ec7 100644 in the appliance, see L. -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0165-mllib-_exit-should-return-a.patch b/SOURCES/0165-mllib-_exit-should-return-a.patch index 62e186f..594f93c 100644 --- a/SOURCES/0165-mllib-_exit-should-return-a.patch +++ b/SOURCES/0165-mllib-_exit-should-return-a.patch @@ -33,5 +33,5 @@ index c1f0ab5..ddf3072 100644 +val _exit : int -> 'a (** Call _exit directly, ie. do not run OCaml atexit handlers. *) -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0166-sparsify-Exit-with-error-code-3-if-fstrim-is-not-sup.patch b/SOURCES/0166-sparsify-Exit-with-error-code-3-if-fstrim-is-not-sup.patch index f4914f0..03b1c20 100644 --- a/SOURCES/0166-sparsify-Exit-with-error-code-3-if-fstrim-is-not-sup.patch +++ b/SOURCES/0166-sparsify-Exit-with-error-code-3-if-fstrim-is-not-sup.patch @@ -60,5 +60,5 @@ index 389ea44..5cd03ef 100644 * selected swap partitions. *) -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0167-daemon-fstrim-Turn-discard-operation-is-not-supporte.patch b/SOURCES/0167-daemon-fstrim-Turn-discard-operation-is-not-supporte.patch index 5ecdaab..630411c 100644 --- a/SOURCES/0167-daemon-fstrim-Turn-discard-operation-is-not-supporte.patch +++ b/SOURCES/0167-daemon-fstrim-Turn-discard-operation-is-not-supporte.patch @@ -49,5 +49,5 @@ index a515c4c..6cadc32 100644 different operation that turns free space in the filesystem into zeroes. It is valid to call C either -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0168-sparsify-Warn-instead-of-error-if-a-filesystem-canno.patch b/SOURCES/0168-sparsify-Warn-instead-of-error-if-a-filesystem-canno.patch index f886e91..32a2ba5 100644 --- a/SOURCES/0168-sparsify-Warn-instead-of-error-if-a-filesystem-canno.patch +++ b/SOURCES/0168-sparsify-Warn-instead-of-error-if-a-filesystem-canno.patch @@ -31,5 +31,5 @@ index 5cd03ef..e2ee9d9 100644 let is_linux_x86_swap = (* Look for the signature for Linux swap on i386. -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0169-sparsify-Add-a-regression-test-for-RHBZ-1364347.patch b/SOURCES/0169-sparsify-Add-a-regression-test-for-RHBZ-1364347.patch index 3bd5413..6a8ca37 100644 --- a/SOURCES/0169-sparsify-Add-a-regression-test-for-RHBZ-1364347.patch +++ b/SOURCES/0169-sparsify-Add-a-regression-test-for-RHBZ-1364347.patch @@ -131,5 +131,5 @@ index 0000000..d6a300d + +rm $img $log -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0170-p2v-Fix-s-is-are-in-GUI-message.patch b/SOURCES/0170-p2v-Fix-s-is-are-in-GUI-message.patch index 0eaf8e1..be17871 100644 --- a/SOURCES/0170-p2v-Fix-s-is-are-in-GUI-message.patch +++ b/SOURCES/0170-p2v-Fix-s-is-are-in-GUI-message.patch @@ -27,5 +27,5 @@ index e0b455a..2e46370 100644 "%s"), remote_dir ? remote_dir : "") == -1) { -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0171-v2v-Make-fstrim-warning-clearer-RHBZ-1366456.patch b/SOURCES/0171-v2v-Make-fstrim-warning-clearer-RHBZ-1366456.patch index 5cbed62..001f781 100644 --- a/SOURCES/0171-v2v-Make-fstrim-warning-clearer-RHBZ-1366456.patch +++ b/SOURCES/0171-v2v-Make-fstrim-warning-clearer-RHBZ-1366456.patch @@ -71,5 +71,5 @@ index 9fc0b72..434f57e 100644 =head2 Guest network configuration -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0172-v2v-Add-o-discard-option-when-fstrimming.patch b/SOURCES/0172-v2v-Add-o-discard-option-when-fstrimming.patch index 4b6832b..03f301f 100644 --- a/SOURCES/0172-v2v-Add-o-discard-option-when-fstrimming.patch +++ b/SOURCES/0172-v2v-Add-o-discard-option-when-fstrimming.patch @@ -30,5 +30,5 @@ index 21f8d77..561317c 100644 try g#fstrim "/" with G.Error msg -> -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0173-v2v-OVMF-is-now-fully-open-source-fix-the-man-page.patch b/SOURCES/0173-v2v-OVMF-is-now-fully-open-source-fix-the-man-page.patch index 14c6481..10a7cdd 100644 --- a/SOURCES/0173-v2v-OVMF-is-now-fully-open-source-fix-the-man-page.patch +++ b/SOURCES/0173-v2v-OVMF-is-now-fully-open-source-fix-the-man-page.patch @@ -24,5 +24,5 @@ index 434f57e..3e24025 100644 Since OVMF support was only recently added to KVM (in 2014/2015), not all target environments support UEFI guests yet: -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0174-Generate-the-lists-of-UEFI-firmware-paths.patch b/SOURCES/0174-Generate-the-lists-of-UEFI-firmware-paths.patch index fc67d08..43eeded 100644 --- a/SOURCES/0174-Generate-the-lists-of-UEFI-firmware-paths.patch +++ b/SOURCES/0174-Generate-the-lists-of-UEFI-firmware-paths.patch @@ -621,5 +621,5 @@ index 4daf38c..bdabab4 100644 val compare_app2_versions : Guestfs.application2 -> Guestfs.application2 -> int (** Compare two app versions. *) -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0175-v2v-Use-OVMF-secure-boot-file-RHBZ-1367615.patch b/SOURCES/0175-v2v-Use-OVMF-secure-boot-file-RHBZ-1367615.patch index cc707be..5692f92 100644 --- a/SOURCES/0175-v2v-Use-OVMF-secure-boot-file-RHBZ-1367615.patch +++ b/SOURCES/0175-v2v-Use-OVMF-secure-boot-file-RHBZ-1367615.patch @@ -358,5 +358,5 @@ index 3e24025..32085c1 100644 Not supported. -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0176-aarch64-uefi-Fix-the-build-on-aarch64.patch b/SOURCES/0176-aarch64-uefi-Fix-the-build-on-aarch64.patch index 8a70cd7..4d9fee0 100644 --- a/SOURCES/0176-aarch64-uefi-Fix-the-build-on-aarch64.patch +++ b/SOURCES/0176-aarch64-uefi-Fix-the-build-on-aarch64.patch @@ -58,5 +58,5 @@ index ebf8063..868122d 100644 /* These functions are used internally by the CLEANUP_* macros. * Don't call them directly. -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0177-RHEL-7-p2v-Fix-build-warning.patch b/SOURCES/0177-RHEL-7-p2v-Fix-build-warning.patch index 090ed5d..9fdad0c 100644 --- a/SOURCES/0177-RHEL-7-p2v-Fix-build-warning.patch +++ b/SOURCES/0177-RHEL-7-p2v-Fix-build-warning.patch @@ -20,5 +20,5 @@ index 455af3e..07d0d83 100644 #include #include -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0178-lib-Don-t-assert-fail-if-port-is-missing-in-XML-RHBZ.patch b/SOURCES/0178-lib-Don-t-assert-fail-if-port-is-missing-in-XML-RHBZ.patch index b4c032c..f0e81e8 100644 --- a/SOURCES/0178-lib-Don-t-assert-fail-if-port-is-missing-in-XML-RHBZ.patch +++ b/SOURCES/0178-lib-Don-t-assert-fail-if-port-is-missing-in-XML-RHBZ.patch @@ -42,5 +42,5 @@ index b096fb3..7d5da2f 100644 return -1; } -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0179-tests-Add-a-regression-test-for-RHBZ-1370424.patch b/SOURCES/0179-tests-Add-a-regression-test-for-RHBZ-1370424.patch index fb88942..953709e 100644 --- a/SOURCES/0179-tests-Add-a-regression-test-for-RHBZ-1370424.patch +++ b/SOURCES/0179-tests-Add-a-regression-test-for-RHBZ-1370424.patch @@ -119,5 +119,5 @@ index 0000000..059ea21 + + -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0180-tests-add-rhbz1370424.xml-to-EXTRA_DIST.patch b/SOURCES/0180-tests-add-rhbz1370424.xml-to-EXTRA_DIST.patch index 22c2c2c..7574323 100644 --- a/SOURCES/0180-tests-add-rhbz1370424.xml-to-EXTRA_DIST.patch +++ b/SOURCES/0180-tests-add-rhbz1370424.xml-to-EXTRA_DIST.patch @@ -23,5 +23,5 @@ index 407c5b0..32bbc83 100644 TESTS = \ -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0181-inspect-change-is_root-flag-into-enum.patch b/SOURCES/0181-inspect-change-is_root-flag-into-enum.patch index 4075d1b..fdc8e31 100644 --- a/SOURCES/0181-inspect-change-is_root-flag-into-enum.patch +++ b/SOURCES/0181-inspect-change-is_root-flag-into-enum.patch @@ -206,5 +206,5 @@ index 497794e..e82c476 100644 } -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0182-inspect-mark-CoreOS-usr-partitions-with-own-USR-role.patch b/SOURCES/0182-inspect-mark-CoreOS-usr-partitions-with-own-USR-role.patch index 6bffa85..6e606b6 100644 --- a/SOURCES/0182-inspect-mark-CoreOS-usr-partitions-with-own-USR-role.patch +++ b/SOURCES/0182-inspect-mark-CoreOS-usr-partitions-with-own-USR-role.patch @@ -53,5 +53,5 @@ index e82c476..e805291 100644 /* CoreOS is designed to contain 2 /usr partitions (USR-A, USR-B): -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0183-inspect-fix-existance-check-of-dev-mapper-devices.patch b/SOURCES/0183-inspect-fix-existance-check-of-dev-mapper-devices.patch index f4e4c80..05b4b06 100644 --- a/SOURCES/0183-inspect-fix-existance-check-of-dev-mapper-devices.patch +++ b/SOURCES/0183-inspect-fix-existance-check-of-dev-mapper-devices.patch @@ -58,5 +58,5 @@ index 8e27ade..8b7a7ee 100644 else if (match3 (g, spec, re_xdev, &type, &disk, &part)) { r = resolve_fstab_device_xdev (g, type, disk, part, &device); -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0184-inspect-gather-info-from-usr-filesystems-as-well-RHB.patch b/SOURCES/0184-inspect-gather-info-from-usr-filesystems-as-well-RHB.patch index 719a9cf..211ba51 100644 --- a/SOURCES/0184-inspect-gather-info-from-usr-filesystems-as-well-RHB.patch +++ b/SOURCES/0184-inspect-gather-info-from-usr-filesystems-as-well-RHB.patch @@ -203,5 +203,5 @@ index e805291..db2a125 100644 static void check_for_duplicated_bsd_root (guestfs_h *g) -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0185-appliance-Disable-EDD-edd-off-RHBZ-1404287.patch b/SOURCES/0185-appliance-Disable-EDD-edd-off-RHBZ-1404287.patch index 79e76bf..4708038 100644 --- a/SOURCES/0185-appliance-Disable-EDD-edd-off-RHBZ-1404287.patch +++ b/SOURCES/0185-appliance-Disable-EDD-edd-off-RHBZ-1404287.patch @@ -34,5 +34,5 @@ index 269eeca..0075ea7 100644 " udev.event-timeout=6000" /* for newer udevd */ " no_timer_check" /* fix for RHBZ#502058 */ -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0186-v2v-o-vdsm-Add-vdsm-compat-flag.-o-rhev-Drop-support.patch b/SOURCES/0186-v2v-o-vdsm-Add-vdsm-compat-flag.-o-rhev-Drop-support.patch index f20bdc4..97fd302 100644 --- a/SOURCES/0186-v2v-o-vdsm-Add-vdsm-compat-flag.-o-rhev-Drop-support.patch +++ b/SOURCES/0186-v2v-o-vdsm-Add-vdsm-compat-flag.-o-rhev-Drop-support.patch @@ -235,5 +235,5 @@ index 32085c1..fb00e82 100644 =item B<--vdsm-vol-uuid> UUID -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0187-virt-v2v-Support-for-ova-exported-from-AWS-RHBZ-1371.patch b/SOURCES/0187-virt-v2v-Support-for-ova-exported-from-AWS-RHBZ-1371.patch index 9ef5386..b2a1943 100644 --- a/SOURCES/0187-virt-v2v-Support-for-ova-exported-from-AWS-RHBZ-1371.patch +++ b/SOURCES/0187-virt-v2v-Support-for-ova-exported-from-AWS-RHBZ-1371.patch @@ -43,5 +43,5 @@ index 0a4dfd5..932c96b 100644 let file_ref = match xpath_string expr with -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0188-v2v-i-disk-Move-code-that-creates-name-from-disk-to-.patch b/SOURCES/0188-v2v-i-disk-Move-code-that-creates-name-from-disk-to-.patch index 3efe1f9..0c2d785 100644 --- a/SOURCES/0188-v2v-i-disk-Move-code-that-creates-name-from-disk-to-.patch +++ b/SOURCES/0188-v2v-i-disk-Move-code-that-creates-name-from-disk-to-.patch @@ -153,5 +153,5 @@ index 0000000..db3ee17 + + Used in particular by [-i disk] mode. *) -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0189-v2v-i-ova-Derive-the-name-from-the-OVA-filename.patch b/SOURCES/0189-v2v-i-ova-Derive-the-name-from-the-OVA-filename.patch index b783f35..6564e5a 100644 --- a/SOURCES/0189-v2v-i-ova-Derive-the-name-from-the-OVA-filename.patch +++ b/SOURCES/0189-v2v-i-ova-Derive-the-name-from-the-OVA-filename.patch @@ -57,5 +57,5 @@ index 73caf34..9ed02ce 100644 ] in let rec loop = function -- -2.7.4 +1.8.3.1 diff --git a/SOURCES/0190-v2v-o-glance-set-all-properties-during-creation-RHBZ.patch b/SOURCES/0190-v2v-o-glance-set-all-properties-during-creation-RHBZ.patch new file mode 100644 index 0000000..64c6fcc --- /dev/null +++ b/SOURCES/0190-v2v-o-glance-set-all-properties-during-creation-RHBZ.patch @@ -0,0 +1,76 @@ +From dfbc0114d8269d05e699d9f12e3176c29eb260d5 Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Tue, 13 Sep 2016 15:30:52 +0200 +Subject: [PATCH] v2v: -o glance: set all properties during creation + (RHBZ#1374405) + +The glance client v1.0.0 defaults to the Image v2 API: this means that +an image can be referenced only by its UUID, and not anymore by the name +as well (which does not need to be unique). This caused our glance +invocation to set the properties for the newly created image to fail, +since we are using the name as identifier. + +Instead of first creating the image and then setting all the properties +for it, set all the properties when creating the image: other than being +simpler, it also avoid parsing the output of the 'glance image-create' +command for the UUID ('id') of the image. + +(cherry picked from commit 1497a9f722f9a3c4c75282fb19578573e3cc89db) +--- + v2v/output_glance.ml | 28 +++++++--------------------- + 1 file changed, 7 insertions(+), 21 deletions(-) + +diff --git a/v2v/output_glance.ml b/v2v/output_glance.ml +index 71f237c..d6c5727 100644 +--- a/v2v/output_glance.ml ++++ b/v2v/output_glance.ml +@@ -73,12 +73,6 @@ object + if i == 0 then source.s_name + else sprintf "%s-disk%d" source.s_name (i+1) in + +- let cmd = [ "glance"; "image-create"; "--name"; name; +- "--disk-format=" ^ target_format; +- "--container-format=bare"; "--file"; target_file ] in +- if run_command cmd <> 0 then +- error (f_"glance: image upload to glance failed, see earlier errors"); +- + (* Set the properties (ie. metadata). *) + let min_ram = source.s_memory /^ 1024L /^ 1024L in + let properties = [ +@@ -109,26 +103,18 @@ object + | x, 0 -> ("os_version", string_of_int x) :: properties + | x, y -> ("os_version", sprintf "%d.%d" x y) :: properties in + +- (* Glance doesn't appear to check the properties. *) +- let cmd = [ "glance"; "image-update"; "--min-ram"; +- Int64.to_string min_ram ] @ ++ let cmd = [ "glance"; "image-create"; "--name"; name; ++ "--disk-format=" ^ target_format; ++ "--container-format=bare"; "--file"; target_file; ++ "--min-ram"; Int64.to_string min_ram ] @ + (List.flatten + (List.map ( + fun (k, v) -> + [ "--property"; sprintf "%s=%s" k v ] + ) properties +- )) @ +- [ name ] in +- if run_command cmd <> 0 then ( +- warning (f_"glance: failed to set image properties (ignored)"); +- (* Dump out the image properties so the user can set them. *) +- eprintf "Image properties:\n"; +- eprintf " --min-ram %Ld\n" min_ram; +- List.iter ( +- fun (k, v) -> +- eprintf " --property %s=%s" (quote k) (quote v) +- ) properties +- ) ++ )) in ++ if run_command cmd <> 0 then ++ error (f_"glance: image upload to glance failed, see earlier errors"); + ) targets + end + +-- +1.8.3.1 + diff --git a/SPECS/libguestfs.spec b/SPECS/libguestfs.spec index 6c39c7f..9b3c24b 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.32.7 -Release: 3%{?dist}.2 +Release: 3%{?dist}.3 License: LGPLv2+ # Source and patches. @@ -222,6 +222,7 @@ Patch0186: 0186-v2v-o-vdsm-Add-vdsm-compat-flag.-o-rhev-Drop-support.patch Patch0187: 0187-virt-v2v-Support-for-ova-exported-from-AWS-RHBZ-1371.patch Patch0188: 0188-v2v-i-disk-Move-code-that-creates-name-from-disk-to-.patch Patch0189: 0189-v2v-i-ova-Derive-the-name-from-the-OVA-filename.patch +patch0190: 0190-v2v-o-glance-set-all-properties-during-creation-RHBZ.patch # Use git for patch management. BuildRequires: git @@ -1351,6 +1352,10 @@ rm ocaml/html/.gitignore %changelog +* Fri May 19 2017 Richard W.M. Jones - 1:1.32.7-3.el7_3.3 +- v2v: -o glance: set all properties during creation + resolves: rhbz#1452570 + * Thu Dec 22 2016 Pino Toscano - 1:1.32.7-3.el7_3.2 - v2v: improve import compatibility with OVAs produced by AWS resolves: rhbz#1408124