From aa0300021dc42864c25cf97e857f2cb97a808d40 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jan 17 2017 15:27:42 +0000 Subject: import libguestfs-1.32.7-3.el7_3.2 --- diff --git a/SOURCES/0001-RHEL-7-Remove-libguestfs-live-RHBZ-798980.patch b/SOURCES/0001-RHEL-7-Remove-libguestfs-live-RHBZ-798980.patch index ad68535..720bb76 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 -- -1.8.3.1 +2.7.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 1f12198..b50bad9 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 -- -1.8.3.1 +2.7.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 56746fa..5fb0036 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" -- -1.8.3.1 +2.7.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 77c228f..6c40b0b 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) -- -1.8.3.1 +2.7.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 65138cc..a20e3a6 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; -- -1.8.3.1 +2.7.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 03d6b7d..dedef8b 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> -- -1.8.3.1 +2.7.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 687cec7..41de4a0 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); -- -1.8.3.1 +2.7.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 ffb289b..487de94 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) { -- -1.8.3.1 +2.7.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 d3bb8f4..7c21f2c 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 70af72d..4696a73 100644 +index 70af72d2..4696a73 100644 --- a/appliance/packagelist.in +++ b/appliance/packagelist.in @@ -184,7 +184,7 @@ ifelse(MAGEIA,1, @@ -22,5 +22,5 @@ index 70af72d..4696a73 100644 gfs2-utils grub -- -1.8.3.1 +2.7.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 e3584f3..4857c97 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 -- -1.8.3.1 +2.7.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 9cee57f..c63b375 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 -- -1.8.3.1 +2.7.4 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 e4473b6..41d0af7 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 (); -- -1.8.3.1 +2.7.4 diff --git a/SOURCES/0015-RHEL-7-Disable-alternate-Augeas-lenses.patch b/SOURCES/0015-RHEL-7-Disable-alternate-Augeas-lenses.patch index 4f83aa2..f91b281 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"); -- -1.8.3.1 +2.7.4 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 e0b3666..0121481 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" -- -1.8.3.1 +2.7.4 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 04b86c3..177247c 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 -- -1.8.3.1 +2.7.4 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 f0d45a2..20df365 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. *) -- -1.8.3.1 +2.7.4 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 fc82564..d078c19 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; -- -1.8.3.1 +2.7.4 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 9992bfd..c09ecbc 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 -- -1.8.3.1 +2.7.4 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 53f367a..1868af3 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 -- -1.8.3.1 +2.7.4 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 1a78327..aa16f32 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. -- -1.8.3.1 +2.7.4 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 5226c27..8eb8163 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 -- -1.8.3.1 +2.7.4 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 2d4f370..2057653 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 -- -1.8.3.1 +2.7.4 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 254d8b7..7830bf8 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: -- -1.8.3.1 +2.7.4 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 8366416..4840bec 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 -- -1.8.3.1 +2.7.4 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 5d5ef7b..d41be75 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 -- -1.8.3.1 +2.7.4 diff --git a/SOURCES/0028-customize-add-globbing-for-delete.patch b/SOURCES/0028-customize-add-globbing-for-delete.patch index 4373004..13c151c 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 }; -- -1.8.3.1 +2.7.4 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 fab8627..f85cf7f 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 -- -1.8.3.1 +2.7.4 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 1694abb..1e9b212 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) -- -1.8.3.1 +2.7.4 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 00fdb9c..0e89d2a 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 -- -1.8.3.1 +2.7.4 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 46a5c0f..e04de9c 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` -- -1.8.3.1 +2.7.4 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 5795ed8..1f398a9 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 -- -1.8.3.1 +2.7.4 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 c59ab6a..966e89f 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; -- -1.8.3.1 +2.7.4 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 41b671f..163c070 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 -- -1.8.3.1 +2.7.4 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 25d9c58..7768db6 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"); -- -1.8.3.1 +2.7.4 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 e728121..991fc89 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 -- -1.8.3.1 +2.7.4 diff --git a/SOURCES/0038-appliance-init-Move-cmdline-parsing-earlier.patch b/SOURCES/0038-appliance-init-Move-cmdline-parsing-earlier.patch index a429161..f73f065 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 -- -1.8.3.1 +2.7.4 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 c65ec3e..513fe91 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 -- -1.8.3.1 +2.7.4 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 cb8fe49..9b39c1f 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 -- -1.8.3.1 +2.7.4 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 000ae21..6c9b83f 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; -- -1.8.3.1 +2.7.4 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 16e010a..5eb73bf 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_ */ -- -1.8.3.1 +2.7.4 diff --git a/SOURCES/0043-rescue-Suggest-using-recursive-bind-mounts.patch b/SOURCES/0043-rescue-Suggest-using-recursive-bind-mounts.patch index 69e3b01..1474bf9 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"); -- -1.8.3.1 +2.7.4 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 3633323..fda1b23 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"); -- -1.8.3.1 +2.7.4 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 e8b9433..0b50961 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 -- -1.8.3.1 +2.7.4 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 b974b4d..ea6a9f3 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; -- -1.8.3.1 +2.7.4 diff --git a/SOURCES/0047-appliance-init-generate-etc-machine-id.patch b/SOURCES/0047-appliance-init-generate-etc-machine-id.patch index 8acb68a..7572715 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 -- -1.8.3.1 +2.7.4 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 95be665..6596576 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"); -- -1.8.3.1 +2.7.4 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 69b53ea..55f891c 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 (); -- -1.8.3.1 +2.7.4 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 29e9e69..105a25e 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 */ -- -1.8.3.1 +2.7.4 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 9b00034..ec1775e 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 -- -1.8.3.1 +2.7.4 diff --git a/SOURCES/0052-tests-qemu-Add-boot-benchmark.patch b/SOURCES/0052-tests-qemu-Add-boot-benchmark.patch index 5957442..70a4837 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); +} -- -1.8.3.1 +2.7.4 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 34911fc..aca95f8 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) { -- -1.8.3.1 +2.7.4 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 1455472..2d056f2 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. */ -- -1.8.3.1 +2.7.4 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 27d3194..a5c6c77 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'); } -- -1.8.3.1 +2.7.4 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 468de1e..27ae806 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") { -- -1.8.3.1 +2.7.4 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 134a40d..3f5c0b2 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); -- -1.8.3.1 +2.7.4 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 555225c..36e87e7 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) -- -1.8.3.1 +2.7.4 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 e665855..3d38fa7 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); -- -1.8.3.1 +2.7.4 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 e14721b..954f77a 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 -- -1.8.3.1 +2.7.4 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 014d635..d99515b 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) ? : ""); } -- -1.8.3.1 +2.7.4 diff --git a/SOURCES/0062-tests-Add-boot-benchmark-range-script.patch b/SOURCES/0062-tests-Add-boot-benchmark-range-script.patch index 6f6500c..1605a3d 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. -- -1.8.3.1 +2.7.4 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 d564406..34d4c57 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 -- -1.8.3.1 +2.7.4 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 2ff5502..0b3324a 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 -- -1.8.3.1 +2.7.4 diff --git a/SOURCES/0065-v2v-target_bus_assignment-Various-refactorings.patch b/SOURCES/0065-v2v-target_bus_assignment-Various-refactorings.patch index 62689cd..d5b567a 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 -- -1.8.3.1 +2.7.4 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 73d905f..7200509 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; -- -1.8.3.1 +2.7.4 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 91ab11a..54b7ab0 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 -- -1.8.3.1 +2.7.4 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 4f83085..ecb662d 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 && -- -1.8.3.1 +2.7.4 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 ac1523f..2ecffca 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 (); } -- -1.8.3.1 +2.7.4 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 fc9c868..cc747bb 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 -- -1.8.3.1 +2.7.4 diff --git a/SOURCES/0071-launch-Disable-USB-in-the-appliance.patch b/SOURCES/0071-launch-Disable-USB-in-the-appliance.patch index 09b9d83..2326b77 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 */ -- -1.8.3.1 +2.7.4 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 7bdc845..bd0b2ee 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") { -- -1.8.3.1 +2.7.4 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 a3a134b..59fe27f 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 */ -- -1.8.3.1 +2.7.4 diff --git a/SOURCES/0074-appliance-Add-pciutils-to-the-appliance.patch b/SOURCES/0074-appliance-Add-pciutils-to-the-appliance.patch index 539652d..905f116 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 -- -1.8.3.1 +2.7.4 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 4efbe60..11d2ebe 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"); } -- -1.8.3.1 +2.7.4 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 6173437..5a7a4b8 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; -- -1.8.3.1 +2.7.4 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 feadbd8..9a29ed4 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 */ -- -1.8.3.1 +2.7.4 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 351ace5..4965b95 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); +} -- -1.8.3.1 +2.7.4 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 5de75e7..c54950e 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. -- -1.8.3.1 +2.7.4 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 135a0e3..02c7eb4 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). -- -1.8.3.1 +2.7.4 diff --git a/SOURCES/0081-utils-Add-README-to-EXTRA_DIST.patch b/SOURCES/0081-utils-Add-README-to-EXTRA_DIST.patch index d717d51..c7a98a7 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 \ -- -1.8.3.1 +2.7.4 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 c6e7284..8374d7a 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: "); -- -1.8.3.1 +2.7.4 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 66c61de..1f381eb 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); -- -1.8.3.1 +2.7.4 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 b0a60e1..8cf5c8a 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 -- -1.8.3.1 +2.7.4 diff --git a/SOURCES/0085-Revert-appliance-init-run-ldconfig.patch b/SOURCES/0085-Revert-appliance-init-run-ldconfig.patch index 26801c3..c647664 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 -- -1.8.3.1 +2.7.4 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 3fa0a3a..6feddef 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 -- -1.8.3.1 +2.7.4 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 aa78e1d..75c6380 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 -- -1.8.3.1 +2.7.4 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 d0afac3..cebb5bd 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. */ -- -1.8.3.1 +2.7.4 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 33459f2..154fffe 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 -- -1.8.3.1 +2.7.4 diff --git a/SOURCES/0090-appliance-Reenable-ACPI.patch b/SOURCES/0090-appliance-Reenable-ACPI.patch index b460467..842ef65 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 */ -- -1.8.3.1 +2.7.4 diff --git a/SOURCES/0091-appliance-Find-udevd-a-bit-faster.patch b/SOURCES/0091-appliance-Find-udevd-a-bit-faster.patch index 20b0925..6bc3ed3 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 -- -1.8.3.1 +2.7.4 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 1952b77..94659e0 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 } -- -1.8.3.1 +2.7.4 diff --git a/SOURCES/0093-v2v-handle-subfolders-in-ova-files.patch b/SOURCES/0093-v2v-handle-subfolders-in-ova-files.patch index a4bb5a0..765488a 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 -- -1.8.3.1 +2.7.4 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 6436599..8e374ad 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 \ -- -1.8.3.1 +2.7.4 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 01f339f..1170ffa 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 -- -1.8.3.1 +2.7.4 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 d0b5333..0dd7841 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> -- -1.8.3.1 +2.7.4 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 5898e8b..cb1ace3 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 -- -1.8.3.1 +2.7.4 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 932e336..abf2397 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 \ -- -1.8.3.1 +2.7.4 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 23fa2d8..7779356 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> -- -1.8.3.1 +2.7.4 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 df53afd..3624cda 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) { -- -1.8.3.1 +2.7.4 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 f517476..eeca105 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_____________________________] │ │ │ -- -1.8.3.1 +2.7.4 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 9b5c3ef..5889a0a 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 -- -1.8.3.1 +2.7.4 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 be701fc..3a71201 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", -- -1.8.3.1 +2.7.4 diff --git a/SOURCES/0104-customize-Add-uninstall-operation-RHBZ-1343375.patch b/SOURCES/0104-customize-Add-uninstall-operation-RHBZ-1343375.patch index 9308f80..27df577 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"; -- -1.8.3.1 +2.7.4 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 26fae55..8274c41 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 } -- -1.8.3.1 +2.7.4 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 4401fd7..6459f59 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 -- -1.8.3.1 +2.7.4 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 c501800..580132d 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: -- -1.8.3.1 +2.7.4 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 5e754b1..2a27d77 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 -- -1.8.3.1 +2.7.4 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 6c55c30..49833c3 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 /** -- -1.8.3.1 +2.7.4 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 bfdeafb..d19c95f 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 -- -1.8.3.1 +2.7.4 diff --git a/SOURCES/0111-virt-tools-Add-common-colours-option.patch b/SOURCES/0111-virt-tools-Add-common-colours-option.patch index 628b170..a01460e 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 -- -1.8.3.1 +2.7.4 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 1520e88..7d546ec 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: -- -1.8.3.1 +2.7.4 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 416debf..22a44db 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 -- -1.8.3.1 +2.7.4 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 e7cc555..3eb8413 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 -- -1.8.3.1 +2.7.4 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 462a626..65acf0a 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); -- -1.8.3.1 +2.7.4 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 6c68815..8563be9 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); -- -1.8.3.1 +2.7.4 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 7cf280a..e62739d 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 -- -1.8.3.1 +2.7.4 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 f6b2c00..f281597 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) -- -1.8.3.1 +2.7.4 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 9acd3c4..ce23929 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 -- -1.8.3.1 +2.7.4 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 32ece16..028e487 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 -- -1.8.3.1 +2.7.4 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 a6503fa..b3afd03 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 *) -- -1.8.3.1 +2.7.4 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 7c4e501..4fbc1b9 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 + + -- -1.8.3.1 +2.7.4 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 5e5a84c..6531ce3 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"); -- -1.8.3.1 +2.7.4 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 5fac537..1d0ebe2 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); -- -1.8.3.1 +2.7.4 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 2ec43cf..6080db2 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; -- -1.8.3.1 +2.7.4 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 0c3b0f6..1f582f2 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); -} -- -1.8.3.1 +2.7.4 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 4803abd..cdb0e1f 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 = -- -1.8.3.1 +2.7.4 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 3ef5b40..230fa83 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; -- -1.8.3.1 +2.7.4 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 a09bd9e..de22dc1 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 -- -1.8.3.1 +2.7.4 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 a80330a..153b85b 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: -- -1.8.3.1 +2.7.4 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 08a991b..82fd9f8 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 } -- -1.8.3.1 +2.7.4 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 5cda32c..a10d5a2 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. -- -1.8.3.1 +2.7.4 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 b0a9675..5b87792 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) -- -1.8.3.1 +2.7.4 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 b29a794..585c49f 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 -- -1.8.3.1 +2.7.4 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 e7a8483..2f9bbac 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 -- -1.8.3.1 +2.7.4 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 cc2ac09..f0262a2 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); -- -1.8.3.1 +2.7.4 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 fa100fe..04c4fd4 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; -- -1.8.3.1 +2.7.4 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 cd9da22..819dc0e 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 -- -1.8.3.1 +2.7.4 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 9d5dffa..d5ea818 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 -- -1.8.3.1 +2.7.4 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 4560fe8..5e611b2 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 -- -1.8.3.1 +2.7.4 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 a858fd8..663b0a8 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) -- -1.8.3.1 +2.7.4 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 64b3f52..86b1eb9 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-* -- -1.8.3.1 +2.7.4 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 afc72c7..8d6ca49 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); -} -- -1.8.3.1 +2.7.4 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 fdae05a..d5c4a72 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 -- -1.8.3.1 +2.7.4 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 161fbc3..9a02ead 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 -- -1.8.3.1 +2.7.4 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 952f6c7..f1e5489 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; -- -1.8.3.1 +2.7.4 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 52058f1..4cc314b 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; -- -1.8.3.1 +2.7.4 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 d7b417c..78c555d 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> -- -1.8.3.1 +2.7.4 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 84f7ed7..47a0867 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" -- -1.8.3.1 +2.7.4 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 ec1348d..b7e4a4c 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`" -- -1.8.3.1 +2.7.4 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 60862a6..606cae4 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 -- -1.8.3.1 +2.7.4 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 6147cef..a7a5b02 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) \ -- -1.8.3.1 +2.7.4 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 25ef14b..bd10583 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 -- -1.8.3.1 +2.7.4 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 002a21d..45a7a44 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); -- -1.8.3.1 +2.7.4 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 ed2b7e9..7d849e9 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 \ -- -1.8.3.1 +2.7.4 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 1780dc3..52474c8 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 -- -1.8.3.1 +2.7.4 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 679cd7e..4d9121c 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 (); -- -1.8.3.1 +2.7.4 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 eed0fe8..9acd6b0 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; -- -1.8.3.1 +2.7.4 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 2097dc8..c76ea8f 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 " -- -1.8.3.1 +2.7.4 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 bf7f0a4..6117ca2 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. *) -- -1.8.3.1 +2.7.4 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 e98c062..4ad83c6 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 -- -1.8.3.1 +2.7.4 diff --git a/SOURCES/0162-podcheck-Check-tool-help-output.patch b/SOURCES/0162-podcheck-Check-tool-help-output.patch index adf88ae..ec08a5c 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" -- -1.8.3.1 +2.7.4 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 0299cfd..f34f834 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. *) -- -1.8.3.1 +2.7.4 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 748aa31..16ee419 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. -- -1.8.3.1 +2.7.4 diff --git a/SOURCES/0165-mllib-_exit-should-return-a.patch b/SOURCES/0165-mllib-_exit-should-return-a.patch index 594f93c..62e186f 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. *) -- -1.8.3.1 +2.7.4 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 03b1c20..f4914f0 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. *) -- -1.8.3.1 +2.7.4 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 630411c..5ecdaab 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 -- -1.8.3.1 +2.7.4 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 32a2ba5..f886e91 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. -- -1.8.3.1 +2.7.4 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 6a8ca37..3bd5413 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 -- -1.8.3.1 +2.7.4 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 be17871..0eaf8e1 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) { -- -1.8.3.1 +2.7.4 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 001f781..5cbed62 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 -- -1.8.3.1 +2.7.4 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 03f301f..4b6832b 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 -> -- -1.8.3.1 +2.7.4 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 10a7cdd..14c6481 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: -- -1.8.3.1 +2.7.4 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 43eeded..fc67d08 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. *) -- -1.8.3.1 +2.7.4 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 5692f92..cc707be 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. -- -1.8.3.1 +2.7.4 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 4d9fee0..8a70cd7 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. -- -1.8.3.1 +2.7.4 diff --git a/SOURCES/0177-RHEL-7-p2v-Fix-build-warning.patch b/SOURCES/0177-RHEL-7-p2v-Fix-build-warning.patch index 9fdad0c..090ed5d 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 -- -1.8.3.1 +2.7.4 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 f0e81e8..b4c032c 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; } -- -1.8.3.1 +2.7.4 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 953709e..fb88942 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 + + -- -1.8.3.1 +2.7.4 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 7574323..22c2c2c 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 = \ -- -1.8.3.1 +2.7.4 diff --git a/SOURCES/0181-inspect-change-is_root-flag-into-enum.patch b/SOURCES/0181-inspect-change-is_root-flag-into-enum.patch new file mode 100644 index 0000000..4075d1b --- /dev/null +++ b/SOURCES/0181-inspect-change-is_root-flag-into-enum.patch @@ -0,0 +1,210 @@ +From a8532145296a97ffe1df63f9be91c88b63cbf603 Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Mon, 5 Dec 2016 16:10:20 +0100 +Subject: [PATCH] inspect: change is_root flag into enum + +Introduce a new enum to classify the role of a filesystem, if available. +This will help later on when doing operations on non-root filesystems, +like detecting particular mountpoints such as /usr. + +The new enum has only "root" as known role, which replaces the is_root +flag. + +(cherry picked from commit 0c4edcecbaa82be2251d296e524e3bb50840ba9e) +--- + src/guestfs-internal.h | 7 ++++++- + src/inspect-fs-cd.c | 2 +- + src/inspect-fs.c | 20 ++++++++++---------- + src/inspect.c | 17 +++++++++-------- + 4 files changed, 26 insertions(+), 20 deletions(-) + +diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h +index 2002253..6f31438 100644 +--- a/src/guestfs-internal.h ++++ b/src/guestfs-internal.h +@@ -594,8 +594,13 @@ enum inspect_os_package_management { + OS_PACKAGE_MANAGEMENT_APK, + }; + ++enum inspect_os_role { ++ OS_ROLE_UNKNOWN = 0, ++ OS_ROLE_ROOT, ++}; ++ + struct inspect_fs { +- int is_root; ++ enum inspect_os_role role; + char *mountable; + enum inspect_os_type type; + enum inspect_os_distro distro; +diff --git a/src/inspect-fs-cd.c b/src/inspect-fs-cd.c +index 09974b5..ab6ee4e 100644 +--- a/src/inspect-fs-cd.c ++++ b/src/inspect-fs-cd.c +@@ -525,7 +525,7 @@ guestfs_int_check_installer_iso (guestfs_h *g, struct inspect_fs *fs, + + /* Otherwise we matched an ISO, so fill in the fs fields. */ + fs->mountable = safe_strdup (g, device); +- fs->is_root = 1; ++ fs->role = OS_ROLE_ROOT; + if (osinfo->is_installer) + fs->format = OS_FORMAT_INSTALLER; + fs->type = osinfo->type; +diff --git a/src/inspect-fs.c b/src/inspect-fs.c +index 87609ab..58f08b8 100644 +--- a/src/inspect-fs.c ++++ b/src/inspect-fs.c +@@ -166,7 +166,7 @@ check_filesystem (guestfs_h *g, const char *mountable, + is_dir_bin && + guestfs_is_file (g, "/etc/freebsd-update.conf") > 0 && + guestfs_is_file (g, "/etc/fstab") > 0) { +- fs->is_root = 1; ++ fs->role = OS_ROLE_ROOT; + fs->format = OS_FORMAT_INSTALLED; + if (guestfs_int_check_freebsd_root (g, fs) == -1) + return -1; +@@ -177,7 +177,7 @@ check_filesystem (guestfs_h *g, const char *mountable, + guestfs_is_file (g, "/netbsd") > 0 && + guestfs_is_file (g, "/etc/fstab") > 0 && + guestfs_is_file (g, "/etc/release") > 0) { +- fs->is_root = 1; ++ fs->role = OS_ROLE_ROOT; + fs->format = OS_FORMAT_INSTALLED; + if (guestfs_int_check_netbsd_root (g, fs) == -1) + return -1; +@@ -188,7 +188,7 @@ check_filesystem (guestfs_h *g, const char *mountable, + guestfs_is_file (g, "/bsd") > 0 && + guestfs_is_file (g, "/etc/fstab") > 0 && + guestfs_is_file (g, "/etc/motd") > 0) { +- fs->is_root = 1; ++ fs->role = OS_ROLE_ROOT; + fs->format = OS_FORMAT_INSTALLED; + if (guestfs_int_check_openbsd_root (g, fs) == -1) + return -1; +@@ -197,7 +197,7 @@ check_filesystem (guestfs_h *g, const char *mountable, + else if (guestfs_is_file (g, "/hurd/console") > 0 && + guestfs_is_file (g, "/hurd/hello") > 0 && + guestfs_is_file (g, "/hurd/null") > 0) { +- fs->is_root = 1; ++ fs->role = OS_ROLE_ROOT; + fs->format = OS_FORMAT_INSTALLED; /* XXX could be more specific */ + if (guestfs_int_check_hurd_root (g, fs) == -1) + return -1; +@@ -208,7 +208,7 @@ check_filesystem (guestfs_h *g, const char *mountable, + guestfs_is_file (g, "/service/vm") > 0 && + guestfs_is_file (g, "/etc/fstab") > 0 && + guestfs_is_file (g, "/etc/version") > 0) { +- fs->is_root = 1; ++ fs->role = OS_ROLE_ROOT; + fs->format = OS_FORMAT_INSTALLED; + if (guestfs_int_check_minix_root (g, fs) == -1) + return -1; +@@ -219,7 +219,7 @@ check_filesystem (guestfs_h *g, const char *mountable, + is_symlink_to (g, "/bin", "usr/bin") > 0) && + (guestfs_is_file (g, "/etc/fstab") > 0 || + guestfs_is_file (g, "/etc/hosts") > 0)) { +- fs->is_root = 1; ++ fs->role = OS_ROLE_ROOT; + fs->format = OS_FORMAT_INSTALLED; + if (guestfs_int_check_linux_root (g, fs) == -1) + return -1; +@@ -230,7 +230,7 @@ check_filesystem (guestfs_h *g, const char *mountable, + guestfs_is_dir (g, "/home") > 0 && + guestfs_is_dir (g, "/usr") > 0 && + guestfs_is_file (g, "/etc/coreos/update.conf") > 0) { +- fs->is_root = 1; ++ fs->role = OS_ROLE_ROOT; + fs->format = OS_FORMAT_INSTALLED; + if (guestfs_int_check_coreos_root (g, fs) == -1) + return -1; +@@ -265,7 +265,7 @@ check_filesystem (guestfs_h *g, const char *mountable, + /* Windows root? */ + else if ((windows_systemroot = guestfs_int_get_windows_systemroot (g)) != NULL) + { +- fs->is_root = 1; ++ fs->role = OS_ROLE_ROOT; + fs->format = OS_FORMAT_INSTALLED; + if (guestfs_int_check_windows_root (g, fs, windows_systemroot) == -1) + return -1; +@@ -280,7 +280,7 @@ check_filesystem (guestfs_h *g, const char *mountable, + /* FreeDOS? */ + else if (guestfs_int_is_dir_nocase (g, "/FDOS") > 0 && + guestfs_int_is_file_nocase (g, "/FDOS/FREEDOS.BSS") > 0) { +- fs->is_root = 1; ++ fs->role = OS_ROLE_ROOT; + fs->format = OS_FORMAT_INSTALLED; + fs->type = OS_TYPE_DOS; + fs->distro = OS_DISTRO_FREEDOS; +@@ -308,7 +308,7 @@ check_filesystem (guestfs_h *g, const char *mountable, + guestfs_is_file (g, "/amd64/txtsetup.sif") > 0 || + guestfs_is_file (g, "/freedos/freedos.ico") > 0 || + guestfs_is_file (g, "/boot/loader.rc") > 0)) { +- fs->is_root = 1; ++ fs->role = OS_ROLE_ROOT; + fs->format = OS_FORMAT_INSTALLER; + if (guestfs_int_check_installer_root (g, fs) == -1) + return -1; +diff --git a/src/inspect.c b/src/inspect.c +index 497794e..e82c476 100644 +--- a/src/inspect.c ++++ b/src/inspect.c +@@ -105,7 +105,7 @@ collect_coreos_inspection_info (guestfs_h *g) + for (i = 0; i < g->nr_fses; ++i) { + struct inspect_fs *fs = &g->fses[i]; + +- if (fs->distro == OS_DISTRO_COREOS && fs->is_root) ++ if (fs->distro == OS_DISTRO_COREOS && fs->role == OS_ROLE_ROOT) + root = fs; + } + +@@ -115,7 +115,7 @@ collect_coreos_inspection_info (guestfs_h *g) + for (i = 0; i < g->nr_fses; ++i) { + struct inspect_fs *fs = &g->fses[i]; + +- if (fs->distro != OS_DISTRO_COREOS || fs->is_root != 0) ++ if (fs->distro != OS_DISTRO_COREOS || fs->role == OS_ROLE_ROOT) + continue; + + /* CoreOS is designed to contain 2 /usr partitions (USR-A, USR-B): +@@ -162,15 +162,16 @@ check_for_duplicated_bsd_root (guestfs_h *g) + fs->type == OS_TYPE_NETBSD || + fs->type == OS_TYPE_OPENBSD; + +- if (fs->is_root && is_bsd && ++ if (fs->role == OS_ROLE_ROOT && is_bsd && + match (g, fs->mountable, re_primary_partition)) { + bsd_primary = fs; + continue; + } + +- if (fs->is_root && bsd_primary && bsd_primary->type == fs->type) { +- /* remove the is root flag from the bsd_primary */ +- bsd_primary->is_root = 0; ++ if (fs->role == OS_ROLE_ROOT && bsd_primary && ++ bsd_primary->type == fs->type) { ++ /* remove the root role from the bsd_primary */ ++ bsd_primary->role = OS_ROLE_UNKNOWN; + bsd_primary->format = OS_FORMAT_UNKNOWN; + return; + } +@@ -196,7 +197,7 @@ guestfs_impl_inspect_get_roots (guestfs_h *g) + * list in this case. + */ + for (i = 0; i < g->nr_fses; ++i) { +- if (g->fses[i].is_root) ++ if (g->fses[i].role == OS_ROLE_ROOT) + guestfs_int_add_string (g, &ret, g->fses[i].mountable); + } + guestfs_int_end_stringsbuf (g, &ret); +@@ -694,7 +695,7 @@ guestfs_int_search_for_root (guestfs_h *g, const char *root) + + for (i = 0; i < g->nr_fses; ++i) { + struct inspect_fs *fs = &g->fses[i]; +- if (fs->is_root && STREQ (root, fs->mountable)) ++ if (fs->role == OS_ROLE_ROOT && STREQ (root, fs->mountable)) + return fs; + } + +-- +2.7.4 + 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 new file mode 100644 index 0000000..6bffa85 --- /dev/null +++ b/SOURCES/0182-inspect-mark-CoreOS-usr-partitions-with-own-USR-role.patch @@ -0,0 +1,57 @@ +From 950cff00671c2412b2bff0f88b699892783962e5 Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Mon, 5 Dec 2016 17:20:58 +0100 +Subject: [PATCH] inspect: mark CoreOS /usr partitions with own USR role + +Add a new inspect role for "/usr" partitions, and use that to mark the +/usr partition in CoreOS: this additional role allows to ease its lookup +later on, when merging its results into those of the root. + +(cherry picked from commit e77e1ef95ed79d34dfcbaa08e26a333462471899) +--- + src/guestfs-internal.h | 1 + + src/inspect-fs-unix.c | 2 ++ + src/inspect.c | 2 +- + 3 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h +index 6f31438..eb201aa 100644 +--- a/src/guestfs-internal.h ++++ b/src/guestfs-internal.h +@@ -597,6 +597,7 @@ enum inspect_os_package_management { + enum inspect_os_role { + OS_ROLE_UNKNOWN = 0, + OS_ROLE_ROOT, ++ OS_ROLE_USR, + }; + + struct inspect_fs { +diff --git a/src/inspect-fs-unix.c b/src/inspect-fs-unix.c +index 149ad85..8e27ade 100644 +--- a/src/inspect-fs-unix.c ++++ b/src/inspect-fs-unix.c +@@ -1055,6 +1055,8 @@ guestfs_int_check_coreos_usr (guestfs_h *g, struct inspect_fs *fs) + + fs->type = OS_TYPE_LINUX; + fs->distro = OS_DISTRO_COREOS; ++ fs->role = OS_ROLE_USR; ++ + if (guestfs_is_file_opts (g, "/share/coreos/lsb-release", + GUESTFS_IS_FILE_OPTS_FOLLOWSYMLINKS, 1, -1) > 0) { + r = parse_lsb_release (g, fs, "/share/coreos/lsb-release"); +diff --git a/src/inspect.c b/src/inspect.c +index e82c476..e805291 100644 +--- a/src/inspect.c ++++ b/src/inspect.c +@@ -115,7 +115,7 @@ collect_coreos_inspection_info (guestfs_h *g) + for (i = 0; i < g->nr_fses; ++i) { + struct inspect_fs *fs = &g->fses[i]; + +- if (fs->distro != OS_DISTRO_COREOS || fs->role == OS_ROLE_ROOT) ++ if (fs->distro != OS_DISTRO_COREOS || fs->role != OS_ROLE_USR) + continue; + + /* CoreOS is designed to contain 2 /usr partitions (USR-A, USR-B): +-- +2.7.4 + 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 new file mode 100644 index 0000000..f4e4c80 --- /dev/null +++ b/SOURCES/0183-inspect-fix-existance-check-of-dev-mapper-devices.patch @@ -0,0 +1,62 @@ +From 60e21f49f1da66af4531b4472670e075d83cd0c1 Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Tue, 6 Dec 2016 15:18:34 +0100 +Subject: [PATCH] inspect: fix existance check of /dev/mapper devices + +When checking for the existance of /dev/mapper devices found in the +fstab of a filesystem, using guestfs_exists means they are checked as +files in the guest, while they really appear as devices on the +appliance. Instead, try the lvm name resolution anyway, and ignore them +when they are reported as missing. + +Thanks to: Richard W.M. Jones. + +Fixes commit 96b6504b09461aeb6850bb2e7b870a0a4c2f5edf. + +(cherry picked from commit dad35e55fac526dbcd50964500f2d5047ae011af) +--- + src/inspect-fs-unix.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/src/inspect-fs-unix.c b/src/inspect-fs-unix.c +index 8e27ade..8b7a7ee 100644 +--- a/src/inspect-fs-unix.c ++++ b/src/inspect-fs-unix.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_ENDIAN_H + #include +@@ -1850,7 +1851,7 @@ resolve_fstab_device (guestfs_h *g, const char *spec, Hash_table *md_map, + char *type, *slice, *disk, *part; + int r; + +- if (STRPREFIX (spec, "/dev/mapper/") && guestfs_exists (g, spec) > 0) { ++ if (STRPREFIX (spec, "/dev/mapper/")) { + /* LVM2 does some strange munging on /dev/mapper paths for VGs and + * LVs which contain '-' character: + * +@@ -1861,7 +1862,17 @@ resolve_fstab_device (guestfs_h *g, const char *spec, Hash_table *md_map, + * This makes it impossible to reverse those paths directly, so + * we have implemented lvm_canonical_lv_name in the daemon. + */ ++ guestfs_push_error_handler (g, NULL, NULL); + device = guestfs_lvm_canonical_lv_name (g, spec); ++ guestfs_pop_error_handler (g); ++ if (device == NULL) { ++ if (guestfs_last_errno (g) == ENOENT) { ++ /* Ignore devices that don't exist. (RHBZ#811872) */ ++ } else { ++ guestfs_int_error_errno (g, guestfs_last_errno (g), "%s", guestfs_last_error (g)); ++ return NULL; ++ } ++ } + } + else if (match3 (g, spec, re_xdev, &type, &disk, &part)) { + r = resolve_fstab_device_xdev (g, type, disk, part, &device); +-- +2.7.4 + 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 new file mode 100644 index 0000000..719a9cf --- /dev/null +++ b/SOURCES/0184-inspect-gather-info-from-usr-filesystems-as-well-RHB.patch @@ -0,0 +1,207 @@ +From ba1ee149fe81cf4061e53eecb0ec0cc1aee63da7 Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Tue, 6 Dec 2016 16:08:12 +0100 +Subject: [PATCH] inspect: gather info from /usr filesystems as well + (RHBZ#1401474) + +Flag the filesystems for Linux /usr properly as USR role, and detect +some data out of it, like the distro information from an os-release +(if present), and the architecture (since the binaries used for our +architecture check will be available there only). + +Later on, collect the results in a way similar to what is done for +CoreOS: for each non-CoreOS root, try to find its /usr filesystem, and +if found then merge what is missing from root; in the last case, also +override the distro inspection data (version, product name) if available +in /usr. + +(cherry picked from commit 1d86b3768956f818262a5189bb1ba996dedbf531) +--- + src/guestfs-internal.h | 1 + + src/inspect-fs-unix.c | 26 ++++++++++++++++ + src/inspect-fs.c | 6 ++-- + src/inspect.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++-- + 4 files changed, 109 insertions(+), 5 deletions(-) + +diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h +index eb201aa..0f5f975 100644 +--- a/src/guestfs-internal.h ++++ b/src/guestfs-internal.h +@@ -795,6 +795,7 @@ extern void guestfs_int_merge_fs_inspections (guestfs_h *g, struct inspect_fs *d + + /* inspect-fs-unix.c */ + extern int guestfs_int_check_linux_root (guestfs_h *g, struct inspect_fs *fs); ++extern int guestfs_int_check_linux_usr (guestfs_h *g, struct inspect_fs *fs); + extern int guestfs_int_check_freebsd_root (guestfs_h *g, struct inspect_fs *fs); + extern int guestfs_int_check_netbsd_root (guestfs_h *g, struct inspect_fs *fs); + extern int guestfs_int_check_openbsd_root (guestfs_h *g, struct inspect_fs *fs); +diff --git a/src/inspect-fs-unix.c b/src/inspect-fs-unix.c +index 8b7a7ee..48c4fd2 100644 +--- a/src/inspect-fs-unix.c ++++ b/src/inspect-fs-unix.c +@@ -813,6 +813,32 @@ guestfs_int_check_linux_root (guestfs_h *g, struct inspect_fs *fs) + return 0; + } + ++/* The currently mounted device looks like a Linux /usr. */ ++int ++guestfs_int_check_linux_usr (guestfs_h *g, struct inspect_fs *fs) ++{ ++ int r; ++ ++ fs->type = OS_TYPE_LINUX; ++ fs->role = OS_ROLE_USR; ++ ++ if (guestfs_is_file_opts (g, "/lib/os-release", ++ GUESTFS_IS_FILE_OPTS_FOLLOWSYMLINKS, 1, -1) > 0) { ++ r = parse_os_release (g, fs, "/lib/os-release"); ++ if (r == -1) /* error */ ++ return -1; ++ if (r == 1) /* ok - detected the release from this file */ ++ goto skip_release_checks; ++ } ++ ++ skip_release_checks:; ++ ++ /* Determine the architecture. */ ++ check_architecture (g, fs); ++ ++ return 0; ++} ++ + /* The currently mounted device is known to be a FreeBSD root. */ + int + guestfs_int_check_freebsd_root (guestfs_h *g, struct inspect_fs *fs) +diff --git a/src/inspect-fs.c b/src/inspect-fs.c +index 58f08b8..f6c2656 100644 +--- a/src/inspect-fs.c ++++ b/src/inspect-fs.c +@@ -247,8 +247,10 @@ check_filesystem (guestfs_h *g, const char *mountable, + is_dir_bin && + is_dir_share && + guestfs_is_dir (g, "/local") > 0 && +- guestfs_is_file (g, "/etc/fstab") == 0) +- ; ++ guestfs_is_file (g, "/etc/fstab") == 0) { ++ if (guestfs_int_check_linux_usr (g, fs) == -1) ++ return -1; ++ } + /* CoreOS /usr? */ + else if (is_dir_bin && + is_dir_share && +diff --git a/src/inspect.c b/src/inspect.c +index e805291..db2a125 100644 +--- a/src/inspect.c ++++ b/src/inspect.c +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_ENDIAN_H + #include +@@ -41,6 +42,8 @@ COMPILE_REGEXP (re_primary_partition, "^/dev/(?:h|s|v)d.[1234]$", 0) + + static void check_for_duplicated_bsd_root (guestfs_h *g); + static void collect_coreos_inspection_info (guestfs_h *g); ++static void collect_linux_inspection_info (guestfs_h *g); ++static void collect_linux_inspection_info_for (guestfs_h *g, struct inspect_fs *root); + + /* The main inspection code. */ + char ** +@@ -81,6 +84,12 @@ guestfs_impl_inspect_os (guestfs_h *g) + */ + check_for_duplicated_bsd_root (g); + ++ /* For Linux guests with a separate /usr filesyste, merge some of the ++ * inspected information in that partition to the inspect_fs struct ++ * of the root filesystem. ++ */ ++ collect_linux_inspection_info (g); ++ + /* At this point we have, in the handle, a list of all filesystems + * found and data about each one. Now we assemble the list of + * filesystems which are root devices and return that to the user. +@@ -143,9 +152,75 @@ collect_coreos_inspection_info (guestfs_h *g) + guestfs_int_merge_fs_inspections (g, root, usr); + } + +-/* On *BSD systems, sometimes /dev/sda[1234] is a shadow of the real root +- * filesystem that is probably /dev/sda5 +- * (see: http://www.freebsd.org/doc/handbook/disk-organization.html) ++/** ++ * Traverse through the filesystems and find the /usr filesystem for ++ * the specified C: if found, merge its basic inspection details ++ * to the root when they were set (i.e. because the /usr had os-release ++ * or other ways to identify the OS). ++ */ ++static void ++collect_linux_inspection_info_for (guestfs_h *g, struct inspect_fs *root) ++{ ++ size_t i; ++ struct inspect_fs *usr = NULL; ++ ++ for (i = 0; i < g->nr_fses; ++i) { ++ struct inspect_fs *fs = &g->fses[i]; ++ size_t j; ++ ++ if (!(fs->distro == root->distro || fs->distro == OS_DISTRO_UNKNOWN) || ++ fs->role != OS_ROLE_USR) ++ continue; ++ ++ for (j = 0; j < root->nr_fstab; ++j) { ++ if (STREQ (fs->mountable, root->fstab[j].mountable)) { ++ usr = fs; ++ goto got_usr; ++ } ++ } ++ } ++ ++ assert (usr == NULL); ++ return; ++ ++ got_usr: ++ /* If the version information in /usr is not null, then most probably ++ * there was an os-release file there, so reset what is in root ++ * and pick the results from /usr. ++ */ ++ if (!(usr->major_version == 0 && usr->minor_version == 0)) { ++ root->distro = OS_DISTRO_UNKNOWN; ++ free (root->product_name); ++ root->product_name = NULL; ++ } ++ ++ guestfs_int_merge_fs_inspections (g, root, usr); ++} ++ ++/** ++ * Traverse through the filesystem list and find out if it contains ++ * the C and C filesystems of a Linux image (but not CoreOS, ++ * for which there is a separate C). ++ * If this is the case, sum up all the collected information on each ++ * root fs from the respective /usr filesystems. ++ */ ++static void ++collect_linux_inspection_info (guestfs_h *g) ++{ ++ size_t i; ++ ++ for (i = 0; i < g->nr_fses; ++i) { ++ struct inspect_fs *fs = &g->fses[i]; ++ ++ if (fs->distro != OS_DISTRO_COREOS && fs->role == OS_ROLE_ROOT) ++ collect_linux_inspection_info_for (g, fs); ++ } ++} ++ ++/** ++ * On *BSD systems, sometimes F is a shadow of the ++ * real root filesystem that is probably F (see: ++ * L) + */ + static void + check_for_duplicated_bsd_root (guestfs_h *g) +-- +2.7.4 + diff --git a/SOURCES/0185-appliance-Disable-EDD-edd-off-RHBZ-1404287.patch b/SOURCES/0185-appliance-Disable-EDD-edd-off-RHBZ-1404287.patch new file mode 100644 index 0000000..79e76bf --- /dev/null +++ b/SOURCES/0185-appliance-Disable-EDD-edd-off-RHBZ-1404287.patch @@ -0,0 +1,38 @@ +From 0e7af58f29e49aba87f3c0d968b084c124fe5dbe Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Sun, 18 Dec 2016 19:27:20 +0000 +Subject: [PATCH] appliance: Disable EDD (edd=off) (RHBZ#1404287). + +EDD (https://en.wikipedia.org/wiki/Enhanced_Disk_Drive) is a BIOS INT 13h +subcall for communicating the extended size of the boot disk over 8GB +to the OS. Since libguestfs doesn't use a boot disk, and the +appliance disk is limited to 4GB, and we use virtio-scsi, this is all +useless. + +EDD is also broken currently on RHEL 7.3, see: +https://bugzilla.redhat.com/show_bug.cgi?id=1404287 + +Also the EDD probing takes significant extra time (about 80ms on my +laptop), and using edd=off reduces this time although doesn't entirely +eliminate it. + +(cherry picked from commit 764fd3fcc629ff91582ec8549ff80c240ba8393b) +--- + src/launch.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/launch.c b/src/launch.c +index 269eeca..0075ea7 100644 +--- a/src/launch.c ++++ b/src/launch.c +@@ -332,6 +332,7 @@ guestfs_int_appliance_command_line (guestfs_h *g, const char *appliance_dev, + */ + " efi-rtc=noprobe" + #endif ++ " edd=off" /* RHBZ#1404287 */ + " udevtimeout=6000"/* for slow systems (RHBZ#480319, RHBZ#1096579) */ + " udev.event-timeout=6000" /* for newer udevd */ + " no_timer_check" /* fix for RHBZ#502058 */ +-- +2.7.4 + 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 new file mode 100644 index 0000000..f20bdc4 --- /dev/null +++ b/SOURCES/0186-v2v-o-vdsm-Add-vdsm-compat-flag.-o-rhev-Drop-support.patch @@ -0,0 +1,239 @@ +From b7a00e7b473add0fa94776292be45a25b31c1407 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Wed, 30 Nov 2016 16:52:42 +0000 +Subject: [PATCH] v2v: -o vdsm: Add --vdsm-compat flag. -o rhev: Drop support + for RHV < 4.1 (RHBZ#1400205). + +Support for RHEV with RHEL 6 nodes required us to output the old style +qcow2 compat=0.10 images. Since RHEV 3.6 GA, RHEL 6 has not been +supported as a RHEV node type. Since RHV 4.1, compat=1.1 is +supported. (Support for compat=1.1 is uncertain in RHV 4.0 even on +RHEL 7 nodes.) + +There are significant downsides to using qcow2 compat=0.10 instead of +the modern default (compat=1.1). + +Therefore this patch does two things: + +For -o rhev, it drops support for compat=0.10 completely. You must +use RHV 4.1. + +For -o vdsm, it adds an interim flag (--vdsm-compat=0.10 or +--vdsm-compat=1.1) which controls the compat level of the qcow2 output +file. VDSM should use --vdsm-compat=1.1 when it is known that modern +qemu is available. We can make this the default later when all RHV +instances have moved to 4.1. + +It also adds: + + vdsm-compat-option + +to the `virt-v2v --machine-readable' output to indicate that this flag +can be used. + +Thanks: Yaniv Kaul, Michal Skrivanek. +(cherry picked from commit bdaeeb4e606f3828887da87ad5acb4f7b49cfed5) +--- + v2v/cmdline.ml | 8 ++++++++ + v2v/output_rhev.ml | 4 ---- + v2v/output_vdsm.ml | 11 ++++++++--- + v2v/output_vdsm.mli | 1 + + v2v/test-v2v-o-vdsm-options.sh | 9 ++++++++- + v2v/virt-v2v.pod | 19 +++++++++++++++++++ + 6 files changed, 44 insertions(+), 8 deletions(-) + +diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml +index b9992eb..f5fb3b3 100644 +--- a/v2v/cmdline.ml ++++ b/v2v/cmdline.ml +@@ -66,6 +66,10 @@ let parse_cmdline () = + let vdsm_vm_uuid = ref None in + let vdsm_ovf_output = ref None in (* default "." *) + let vmtype = ref None in ++ ++ let vdsm_compat = ref "0.10" in ++ let set_vdsm_compat s = vdsm_compat := s in ++ + let set_string_option_once optname optref arg = + match !optref with + | Some _ -> +@@ -215,6 +219,7 @@ let parse_cmdline () = + "file " ^ s_"Use password from file"; + "--print-source", Arg.Set print_source, " " ^ s_"Print source and stop"; + "--root", Arg.String set_root_choice,"ask|... " ^ s_"How to choose root filesystem"; ++ "--vdsm-compat", Arg.Symbol (["0.10"; "1.1"], set_vdsm_compat), " " ^ s_"Write qcow2 with compat=0.10|1.1"; + "--vdsm-image-uuid", Arg.String add_vdsm_image_uuid, "uuid " ^ s_"Output image UUID(s)"; + "--vdsm-vol-uuid", Arg.String add_vdsm_vol_uuid, "uuid " ^ s_"Output vol UUID(s)"; + "--vdsm-vm-uuid", Arg.String (set_string_option_once "--vdsm-vm-uuid" vdsm_vm_uuid), +@@ -277,6 +282,7 @@ read the man page virt-v2v(1). + let print_source = !print_source in + let qemu_boot = !qemu_boot in + let root_choice = !root_choice in ++ let vdsm_compat = !vdsm_compat in + let vdsm_image_uuids = List.rev !vdsm_image_uuids in + let vdsm_vol_uuids = List.rev !vdsm_vol_uuids in + let vdsm_vm_uuid = !vdsm_vm_uuid in +@@ -297,6 +303,7 @@ read the man page virt-v2v(1). + printf "virt-v2v\n"; + printf "libguestfs-rewrite\n"; + printf "colours-option\n"; ++ printf "vdsm-compat-option\n"; + List.iter (printf "input:%s\n") (Modules_list.input_modules ()); + List.iter (printf "output:%s\n") (Modules_list.output_modules ()); + List.iter (printf "convert:%s\n") (Modules_list.convert_modules ()); +@@ -454,6 +461,7 @@ read the man page virt-v2v(1). + vol_uuids = vdsm_vol_uuids; + vm_uuid = vdsm_vm_uuid; + ovf_output = vdsm_ovf_output; ++ compat = vdsm_compat; + } in + Output_vdsm.output_vdsm os vdsm_params vmtype output_alloc in + +diff --git a/v2v/output_rhev.ml b/v2v/output_rhev.ml +index ae37a3f..7bd94df 100644 +--- a/v2v/output_rhev.ml ++++ b/v2v/output_rhev.ml +@@ -253,10 +253,6 @@ object + Changeuid.func changeuid_t ( + fun () -> + let g = open_guestfs ~identifier:"rhev_disk_create" () in +- (* For qcow2, override v2v-supplied compat option, because RHEL 6 +- * nodes cannot handle qcow2 v3 (RHBZ#1145582). +- *) +- let compat = if format <> "qcow2" then compat else Some "0.10" in + g#disk_create ?backingfile ?backingformat ?preallocation ?compat + ?clustersize path format size; + (* Make it sufficiently writable so that possibly root, or +diff --git a/v2v/output_vdsm.ml b/v2v/output_vdsm.ml +index 7bb28a9..57b5352 100644 +--- a/v2v/output_vdsm.ml ++++ b/v2v/output_vdsm.ml +@@ -30,6 +30,7 @@ type vdsm_params = { + vol_uuids : string list; + vm_uuid : string; + ovf_output : string; ++ compat : string; + } + + class output_vdsm os vdsm_params vmtype output_alloc = +@@ -37,7 +38,7 @@ object + inherit output + + method as_options = +- sprintf "-o vdsm -os %s%s%s --vdsm-vm-uuid %s --vdsm-ovf-output %s%s" os ++ sprintf "-o vdsm -os %s%s%s --vdsm-vm-uuid %s --vdsm-ovf-output %s%s%s" os + (String.concat "" + (List.map (sprintf " --vdsm-image-uuid %s") vdsm_params.image_uuids)) + (String.concat "" +@@ -48,6 +49,9 @@ object + | None -> "" + | Some Server -> " --vmtype server" + | Some Desktop -> " --vmtype desktop") ++ (match vdsm_params.compat with ++ | "0.10" -> "" (* currently this is the default, so don't print it *) ++ | s -> sprintf " --vdsm-compat=%s" s) + + method supported_firmware = [ TargetBIOS ] + +@@ -153,9 +157,10 @@ object + ?clustersize path format size = + let g = open_guestfs ~identifier:"vdsm_disk_create" () in + (* For qcow2, override v2v-supplied compat option, because RHEL 6 +- * nodes cannot handle qcow2 v3 (RHBZ#1145582). ++ * nodes cannot handle qcow2 v3 (RHBZ#1145582, RHBZ#1400205). + *) +- let compat = if format <> "qcow2" then compat else Some "0.10" in ++ let compat = ++ if format <> "qcow2" then compat else Some vdsm_params.compat in + g#disk_create ?backingfile ?backingformat ?preallocation ?compat + ?clustersize path format size + +diff --git a/v2v/output_vdsm.mli b/v2v/output_vdsm.mli +index 1a88eaa..40eceee 100644 +--- a/v2v/output_vdsm.mli ++++ b/v2v/output_vdsm.mli +@@ -23,6 +23,7 @@ type vdsm_params = { + vol_uuids : string list; (* --vdsm-vol-uuid (multiple) *) + vm_uuid : string; (* --vdsm-vm-uuid *) + ovf_output : string; (* --vdsm-ovf-output *) ++ compat : string; (* --vdsm-compat=0.10|1.1 *) + } + (** Miscellaneous extra command line parameters used by VDSM. *) + +diff --git a/v2v/test-v2v-o-vdsm-options.sh b/v2v/test-v2v-o-vdsm-options.sh +index 6ae5d56..de07b9c 100755 +--- a/v2v/test-v2v-o-vdsm-options.sh ++++ b/v2v/test-v2v-o-vdsm-options.sh +@@ -1,6 +1,6 @@ + #!/bin/bash - + # libguestfs virt-v2v test script +-# Copyright (C) 2014 Red Hat Inc. ++# Copyright (C) 2014-2016 Red Hat Inc. + # + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +@@ -21,6 +21,7 @@ + unset CDPATH + export LANG=C + set -e ++set -x + + if [ -n "$SKIP_TEST_V2V_O_VDSM_OPTIONS_SH" ]; then + echo "$0: test skipped because environment variable is set" +@@ -62,10 +63,12 @@ $VG virt-v2v --debug-gc \ + -i libvirt -ic "$libvirt_uri" windows \ + -o vdsm -os $d/12345678-1234-1234-1234-123456789abc \ + --vmtype desktop \ ++ -of qcow2 \ + --vdsm-image-uuid IMAGE \ + --vdsm-vol-uuid VOL \ + --vdsm-vm-uuid VM \ + --vdsm-ovf-output $d/12345678-1234-1234-1234-123456789abc/master/vms/VM \ ++ --vdsm-compat=1.1 + + # Test the OVF metadata was created. + test -f $d/12345678-1234-1234-1234-123456789abc/master/vms/VM/VM.ovf +@@ -82,6 +85,10 @@ test -f VOL.meta + # Test the disk file was created. + test -f VOL + ++# Test that a qcow2 file with compat=1.1 was generated. ++test "$(guestfish disk-format VOL)" = "qcow2" ++qemu-img info VOL | grep 'compat: 1.1' ++ + popd + + rm -r $d +diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod +index 32085c1..fb00e82 100644 +--- a/v2v/virt-v2v.pod ++++ b/v2v/virt-v2v.pod +@@ -495,6 +495,25 @@ boot an operating system from the first VirtIO disk. Specifically, + F must be on the first VirtIO disk, and it cannot chainload an + OS which is not in the first VirtIO disk. + ++=item B<--vdsm-compat=0.10> ++ ++=item B<--vdsm-compat=1.1> ++ ++If I<-o vdsm> and the output format is qcow2, then we add the qcow2 ++I option to the output file for compatibility with RHEL 6 ++(see L). ++ ++If I<--vdsm-compat=1.1> is used then modern qcow2 (I) ++files are generated instead. ++ ++Currently I<--vdsm-compat=0.10> is the default, but this will change ++to I<--vdsm-compat=1.1> in a future version of virt-v2v (when we can ++assume that everyone is using a modern version of qemu). ++ ++B output>. All other output ++modes (including I<-o rhev>) generate modern qcow2 I ++files, always. ++ + =item B<--vdsm-image-uuid> UUID + + =item B<--vdsm-vol-uuid> UUID +-- +2.7.4 + 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 new file mode 100644 index 0000000..9ef5386 --- /dev/null +++ b/SOURCES/0187-virt-v2v-Support-for-ova-exported-from-AWS-RHBZ-1371.patch @@ -0,0 +1,47 @@ +From d84af86948e82322f95a99d2ecd46bec04977d26 Mon Sep 17 00:00:00 2001 +From: Shahar Havivi +Date: Thu, 8 Sep 2016 09:53:37 +0300 +Subject: [PATCH] virt-v2v: Support for ova exported from AWS (RHBZ#1371843). + +1. AWS the name tag is not mandatory - using default as a name +2. AWD doesn't prefix 'ovf:' as prefix to disk path + +There is an open bug for oVirt: +https://bugzilla.redhat.com/show_bug.cgi?id=1371843 + +Signed-off-by: Shahar Havivi +(cherry picked from commit 1ae4252c93c685cb8561b55c1231502b37212b5a) +--- + v2v/input_ova.ml | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/v2v/input_ova.ml b/v2v/input_ova.ml +index 0a4dfd5..932c96b 100644 +--- a/v2v/input_ova.ml ++++ b/v2v/input_ova.ml +@@ -185,7 +185,8 @@ object + let name = + match xpath_string "/ovf:Envelope/ovf:VirtualSystem/ovf:Name/text()" with + | None | Some "" -> +- error (f_"could not parse ovf:Name from OVF document") ++ warning (f_"could not parse ovf:Name from OVF document"); ++ "default" + | Some name -> name in + + (* Search for memory. *) +@@ -245,10 +246,10 @@ object + + Xml.xpathctx_set_current_context xpathctx n; + let file_id = xpath_string_default "rasd:HostResource/text()" "" in +- let rex = Str.regexp "^ovf:/disk/\\(.*\\)" in ++ let rex = Str.regexp "^\\(ovf:\\)?/disk/\\(.*\\)" in + if Str.string_match rex file_id 0 then ( + (* Chase the references through to the actual file name. *) +- let file_id = Str.matched_group 1 file_id in ++ let file_id = Str.matched_group 2 file_id in + let expr = sprintf "/ovf:Envelope/ovf:DiskSection/ovf:Disk[@ovf:diskId='%s']/@ovf:fileRef" file_id in + let file_ref = + match xpath_string expr with +-- +2.7.4 + 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 new file mode 100644 index 0000000..3efe1f9 --- /dev/null +++ b/SOURCES/0188-v2v-i-disk-Move-code-that-creates-name-from-disk-to-.patch @@ -0,0 +1,157 @@ +From 2ddaafb1b90169e4cb35b2e47116a95ff9045f6b Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Fri, 9 Sep 2016 14:45:05 +0100 +Subject: [PATCH] v2v: -i disk: Move code that creates name from disk to + separate module. + +Simple code motion. + +(cherry picked from commit 312379c8a61cd4a16aa7c80c1adda3081e601d43) +--- + v2v/Makefile.am | 2 ++ + v2v/input_disk.ml | 21 ++------------------- + v2v/name_from_disk.ml | 41 +++++++++++++++++++++++++++++++++++++++++ + v2v/name_from_disk.mli | 24 ++++++++++++++++++++++++ + 4 files changed, 69 insertions(+), 19 deletions(-) + create mode 100644 v2v/name_from_disk.ml + create mode 100644 v2v/name_from_disk.mli + +diff --git a/v2v/Makefile.am b/v2v/Makefile.am +index c1ebb17..f9a0796 100644 +--- a/v2v/Makefile.am ++++ b/v2v/Makefile.am +@@ -62,6 +62,7 @@ SOURCES_MLI = \ + inspect_source.mli \ + linux.mli \ + modules_list.mli \ ++ name_from_disk.mli \ + output_glance.mli \ + output_libvirt.mli \ + output_local.mli \ +@@ -84,6 +85,7 @@ SOURCES_ML = \ + xml.ml \ + uefi.ml \ + utils.ml \ ++ name_from_disk.ml \ + vCenter.ml \ + domainxml.ml \ + DOM.ml \ +diff --git a/v2v/input_disk.ml b/v2v/input_disk.ml +index b6c9089..9a2ef08 100644 +--- a/v2v/input_disk.ml ++++ b/v2v/input_disk.ml +@@ -23,6 +23,7 @@ open Common_utils + + open Types + open Utils ++open Name_from_disk + + class input_disk input_format disk = object + inherit input +@@ -42,25 +43,7 @@ class input_disk input_format disk = object + * the filename passed in. Users can override this using the + * `-on name' option. + *) +- let name = +- let name = Filename.basename disk in +- (* Remove the extension (or suffix), only if it's one usually +- * used for disk images. *) +- let suffixes = [ +- ".img"; ".qcow2"; ".raw"; ".vmdk"; +- "-sda"; +- ] in +- let rec loop = function +- | suff :: xs -> +- if Filename.check_suffix name suff then +- Filename.chop_suffix name suff +- else +- loop xs +- | [] -> name +- in +- loop suffixes in +- if name = "" then +- error (f_"-i disk: invalid input filename (%s)") disk; ++ let name = name_from_disk disk in + + (* Get the absolute path to the disk file. *) + let disk_absolute = absolute_path disk in +diff --git a/v2v/name_from_disk.ml b/v2v/name_from_disk.ml +new file mode 100644 +index 0000000..73caf34 +--- /dev/null ++++ b/v2v/name_from_disk.ml +@@ -0,0 +1,41 @@ ++(* virt-v2v ++ * Copyright (C) 2009-2016 Red Hat Inc. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++ *) ++ ++open Common_gettext.Gettext ++open Common_utils ++ ++let name_from_disk disk = ++ let name = Filename.basename disk in ++ (* Remove the extension (or suffix), only if it's one usually ++ * used for disk images. *) ++ let suffixes = [ ++ ".img"; ".qcow2"; ".raw"; ".vmdk"; ++ "-sda"; ++ ] in ++ let rec loop = function ++ | suff :: xs -> ++ if Filename.check_suffix name suff then ++ Filename.chop_suffix name suff ++ else ++ loop xs ++ | [] -> name ++ in ++ let name = loop suffixes in ++ if name = "" then ++ error (f_"invalid input filename (%s)") disk; ++ name +diff --git a/v2v/name_from_disk.mli b/v2v/name_from_disk.mli +new file mode 100644 +index 0000000..db3ee17 +--- /dev/null ++++ b/v2v/name_from_disk.mli +@@ -0,0 +1,24 @@ ++(* virt-v2v ++ * Copyright (C) 2009-2016 Red Hat Inc. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++ *) ++ ++(** Derive the source name from a disk name. *) ++ ++val name_from_disk : string -> string ++(** Take a disk name and derive from it a suitable source name. ++ ++ Used in particular by [-i disk] mode. *) +-- +2.7.4 + 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 new file mode 100644 index 0000000..b783f35 --- /dev/null +++ b/SOURCES/0189-v2v-i-ova-Derive-the-name-from-the-OVA-filename.patch @@ -0,0 +1,61 @@ +From 83aad5289c4c1f1ee7c5b2efabcd27d3b7a08420 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Fri, 9 Sep 2016 14:56:11 +0100 +Subject: [PATCH] v2v: -i ova: Derive the name from the OVA filename. + +If the guest has no element in the OVF, previously we chose +"default" as the name. This changes that so it uses a name derived +from the basename of the OVA file instead. + +For example: + + virt-v2v -i ova /path/to/myguest.ova [...] + +would use "myguest" as the name (assuming no was present). + +Modifies the behaviour of +commit 1ae4252c93c685cb8561b55c1231502b37212b5a. + +(cherry picked from commit 98619f9c26076d034574b8822dfcc6799741ed96) +--- + v2v/input_ova.ml | 3 ++- + v2v/name_from_disk.ml | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/v2v/input_ova.ml b/v2v/input_ova.ml +index 932c96b..c5ff19c 100644 +--- a/v2v/input_ova.ml ++++ b/v2v/input_ova.ml +@@ -23,6 +23,7 @@ open Common_utils + + open Types + open Utils ++open Name_from_disk + + class input_ova ova = + let tmpdir = +@@ -186,7 +187,7 @@ object + match xpath_string "/ovf:Envelope/ovf:VirtualSystem/ovf:Name/text()" with + | None | Some "" -> + warning (f_"could not parse ovf:Name from OVF document"); +- "default" ++ name_from_disk ova + | Some name -> name in + + (* Search for memory. *) +diff --git a/v2v/name_from_disk.ml b/v2v/name_from_disk.ml +index 73caf34..9ed02ce 100644 +--- a/v2v/name_from_disk.ml ++++ b/v2v/name_from_disk.ml +@@ -24,7 +24,7 @@ let name_from_disk disk = + (* Remove the extension (or suffix), only if it's one usually + * used for disk images. *) + let suffixes = [ +- ".img"; ".qcow2"; ".raw"; ".vmdk"; ++ ".img"; ".ova"; ".qcow2"; ".raw"; ".vmdk"; + "-sda"; + ] in + let rec loop = function +-- +2.7.4 + diff --git a/SPECS/libguestfs.spec b/SPECS/libguestfs.spec index 5c05825..6c39c7f 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} +Release: 3%{?dist}.2 License: LGPLv2+ # Source and patches. @@ -213,6 +213,15 @@ Patch0177: 0177-RHEL-7-p2v-Fix-build-warning.patch Patch0178: 0178-lib-Don-t-assert-fail-if-port-is-missing-in-XML-RHBZ.patch Patch0179: 0179-tests-Add-a-regression-test-for-RHBZ-1370424.patch Patch0180: 0180-tests-add-rhbz1370424.xml-to-EXTRA_DIST.patch +Patch0181: 0181-inspect-change-is_root-flag-into-enum.patch +Patch0182: 0182-inspect-mark-CoreOS-usr-partitions-with-own-USR-role.patch +Patch0183: 0183-inspect-fix-existance-check-of-dev-mapper-devices.patch +Patch0184: 0184-inspect-gather-info-from-usr-filesystems-as-well-RHB.patch +Patch0185: 0185-appliance-Disable-EDD-edd-off-RHBZ-1404287.patch +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 # Use git for patch management. BuildRequires: git @@ -405,7 +414,7 @@ guest filesystem that Linux and qemu can, including but not limited to: ext2/3/4, btrfs, FAT and NTFS, LVM, many different disk partition schemes, qcow, qcow2, vmdk. -Libguestfs for CentOS Linux is split into several subpackages. +Libguestfs for Red Hat Enterprise Linux is split into several subpackages. The basic subpackages are: libguestfs C library @@ -1045,6 +1054,14 @@ move_to rsync zz-packages-rsync move_to xfsprogs zz-packages-xfs popd +# If there is a bogus dependency on kernel-rt, rename it to 'kernel' +# instead. This happens when the version of kernel-rt in brew is +# greater than the version of kernel (kernel-rt 'Provides: kernel'). +pushd $RPM_BUILD_ROOT%{_libdir}/guestfs/supermin.d +sed 's/^kernel-rt$/kernel/' < packages > packages-t +mv packages-t packages +popd + # Guestfish colour prompts. mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d install -m 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d @@ -1334,8 +1351,18 @@ rm ocaml/html/.gitignore %changelog -* Mon Nov 14 2016 Johnny Hughes - 1:1.32.7-3 -- Manual Debranding +* 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 +- Avoid spurious dependency on kernel-rt. + +* Wed Dec 21 2016 Pino Toscano - 1:1.32.7-3.el7_3.1 +- Fix inspection with UsrMove and /usr in a separate partition + resolves: rhbz#1406289 +- Disable EDD when launching the appliance + resolves: rhbz#1406393 +- v2v: add --vdsm-compat=1.1 flag for VDSM + resolves: rhbz#1406854 * Tue Aug 30 2016 Richard W.M. Jones - 1:1.32.7-3 - Rebase to libguestfs 1.32 in RHEL 7.3