Created attachment 1378509 [details]
rhel7-resume.log

Description of problem:
Resume=/dev/sdaX can't be updated to resume=/dev/vdaX in rhel7 guest's grub file after v2v conversion


Version-Release number of selected component (if applicable):
virt-v2v-1.36.10-4.el7.x86_64
libguestfs-1.36.10-4.el7.x86_64
libvirt-3.9.0-7.el7.x86_64
qemu-kvm-rhev-2.10.0-15.el7.x86_64


How reproducible:
100%

Steps to Reproduce:
1.Prepare a rhel7 guest which has swap partition
1.1 # lsblk
NAME   MAJ:MIN RM  SIZE RO TYPE MOUNTPOINT
sda      8:0    0   10G  0 disk 
├─sda1   8:1    0  7.8G  0 part /
└─sda2   8:2    0  2.2G  0 part [SWAP]


1.2 # cat /etc/fstab 
....
UUID=d5ca8ffb-720a-42da-9ecc-f562bd26b115 /                       ext4    defaults        1 1
/dev/sda2	swap                    swap    defaults        0 0


2.Add resume info into /etc/default/grub 
# cat /etc/default/grub 
GRUB_TIMEOUT=5
GRUB_DISTRIBUTOR="$(sed 's, release .*$,,g' /etc/system-release)"
GRUB_DEFAULT=saved
GRUB_DISABLE_SUBMENU=true
GRUB_TERMINAL_OUTPUT="console"
GRUB_CMDLINE_LINUX="crashkernel=auto rhgb quiet"
GRUB_DISABLE_RECOVERY="true"
GRUB_CMDLINE_LINUX_DEFAULT="resume=/dev/sda2"

3.Use v2v to convert the guest to rhv and there is no error during conversion
# virt-v2v rhel7.5-resume -o rhv -os 10.73.131.93:/home/nfs_export
[   0.0] Opening the source -i libvirt rhel7.5-resume
[   0.0] Creating an overlay to protect the source from being modified
[   0.7] Initializing the target -o rhv -os 10.73.131.93:/home/nfs_export
[   1.7] Opening the overlay
[   4.4] Inspecting the overlay
[ 138.0] Checking for sufficient free disk space in the guest
[ 138.0] Estimating space required on target for each disk
[ 138.0] Converting Red Hat Enterprise Linux Server 7.5 Beta (Maipo) to run on KVM
virt-v2v: This guest has virtio drivers installed.
[ 265.8] Mapping filesystem data to avoid copying unused and blank areas
[ 267.5] Closing the overlay
[ 270.2] Checking if the guest needs BIOS or UEFI to boot
[ 270.2] Assigning disks to buses
[ 270.2] Copying disk 1/1 to /tmp/v2v.wC8SS8/a2f71361-0af3-41db-bfa2-6438e1558cbd/images/e1d3e537-cbec-47b5-9c09-5a077d6ea28f/220a16e3-4872-426e-af46-85170dcb633b (qcow2)
    (100.00/100%)
[ 473.5] Creating output metadata
[ 473.6] Finishing off

4.Check resume info in /boot/grub2/grub.cfg for converted guest at rhv after finishing conversion
4.1 # lsblk
NAME   MAJ:MIN RM  SIZE RO TYPE MOUNTPOINT
sr0     11:0    1 1024M  0 rom  
vda    253:0    0   10G  0 disk 
├─vda1 253:1    0  7.8G  0 part /
└─vda2 253:2    0  2.2G  0 part [SWAP]

4.2 # cat /boot/grub2/device.map
# this device map was generated by anaconda
(hd0)      /dev/vda
(hd1)      /dev/vda

4.3 # cat /etc/fstab
....
UUID=d5ca8ffb-720a-42da-9ecc-f562bd26b115 /                       ext4    defaults        1 1
/dev/vda2	swap                    swap    defaults        0 0


4.4 # cat /boot/grub2/grub.cfg 
....
menuentry 'Red Hat Enterprise Linux Server (3.10.0-823.el7.x86_64) 7.5 (Maipo)' --class red --class gnu-linux --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-3.10.0-823.el7.x86_64-advanced-d5ca8ffb-720a-42da-9ecc-f562bd26b115' {
	....
	linux16 /boot/vmlinuz-3.10.0-823.el7.x86_64 root=UUID=d5ca8ffb-720a-42da-9ecc-f562bd26b115 ro crashkernel=auto rhgb quiet resume=/dev/sda2
	initrd16 /boot/initramfs-3.10.0-823.el7.x86_64.img
}
menuentry 'Red Hat Enterprise Linux Server (0-rescue-acd9b2fd1f8f4842b7b98344a756997d) 7.5 (Maipo)' --class red --class gnu-linux --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-0-rescue-acd9b2fd1f8f4842b7b98344a756997d-advanced-d5ca8ffb-720a-42da-9ecc-f562bd26b115' {
	...
	linux16 /boot/vmlinuz-0-rescue-acd9b2fd1f8f4842b7b98344a756997d root=UUID=d5ca8ffb-720a-42da-9ecc-f562bd26b115 ro crashkernel=auto rhgb quiet resume=/dev/sda2
	initrd16 /boot/initramfs-0-rescue-acd9b2fd1f8f4842b7b98344a756997d.img
}
....

Actual results:
As above description

Expected results:
Resume=/dev/sdaX can be updated to resume=/dev/vdaX in rhel7 guest's grub file after v2v conversion

Additional info:
Resume=/dev/sdaX can be updated to resume=/dev/vdaX in rhel6 guest's grub file after v2v conversion