From bcf3dd9c7e706609154f49c25e2b78dece00aabd Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 30 Aug 2015 03:21:57 -0400 Subject: [PATCH] RHEL: Fixes for libguestfs-winsupport. In tests we cannot use guestfish for arbitrary Windows edits. In virt-v2v helpers we must set the program name to virt-v2v. --- convert/convert.ml | 1 + convert/windows_virtio.ml | 1 + test-data/phony-guests/make-windows-img.sh | 1 + tests/test-v2v-virtio-win-iso.sh | 8 +++++++- tests/test-v2v-windows-conversion.sh | 8 +++++++- 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/convert/convert.ml b/convert/convert.ml index d0d5b773..c3dd4151 100644 --- a/convert/convert.ml +++ b/convert/convert.ml @@ -51,6 +51,7 @@ let rec convert dir options source = message (f_"Opening the source"); let g = open_guestfs ~identifier:"v2v" () in + g#set_program "virt-v2v"; g#set_memsize (g#get_memsize () * 2); (* Setting the number of vCPUs allows parallel mkinitrd, but make * sure this is not too large because each vCPU consumes guest RAM. diff --git a/convert/windows_virtio.ml b/convert/windows_virtio.ml index 6b642d21..2cef4234 100644 --- a/convert/windows_virtio.ml +++ b/convert/windows_virtio.ml @@ -256,6 +256,7 @@ and copy_from_virtio_win g inspect srcdir destdir filter missing = let g2 = try let g2 = open_guestfs ~identifier:"virtio_win" () in + g#set_program "virt-v2v"; g2#add_drive_opts virtio_win ~readonly:true; g2#launch (); g2 diff --git a/test-data/phony-guests/make-windows-img.sh b/test-data/phony-guests/make-windows-img.sh index 30908a91..73cf5144 100755 --- a/test-data/phony-guests/make-windows-img.sh +++ b/test-data/phony-guests/make-windows-img.sh @@ -37,6 +37,7 @@ fi # Create a disk image. guestfish < "$script" :> "$expected" +cat >> "$script" < "$response" +guestfish --ro -a "$d/windows-sda" < "$script" > "$response" diff -u "$expected" "$response" diff --git a/tests/test-v2v-windows-conversion.sh b/tests/test-v2v-windows-conversion.sh index a4cf191d..1ff41f6a 100755 --- a/tests/test-v2v-windows-conversion.sh +++ b/tests/test-v2v-windows-conversion.sh @@ -76,6 +76,12 @@ mktest () :> "$script" :> "$expected" +cat >> "$script" < "$response" +guestfish --ro -a "$d/windows-sda" < "$script" > "$response" diff -u "$expected" "$response" # We also update the Registry several times, for firstboot, and (ONLY