[Pkg-libvirt-commits] [libguestfs] 23/78: rescue: Fix the --suggest regression test so it works when using UML backend.

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch experimental
in repository libguestfs.

commit 7c1d95cca0599ac63e5d82adde62bd9a0cbbde7e
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Mon Mar 31 18:00:07 2014 +0100

    rescue: Fix the --suggest regression test so it works when using UML backend.
    
    The boot partition name is /dev/ubda1 in this case, so use a small sed
    script to canonicalize it for the test comparison.
    
    This fixes commit f6a37740f2ba6668bee4952fdd35c46cb6d79cba.
---
 rescue/test-virt-rescue-suggest.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/rescue/test-virt-rescue-suggest.sh b/rescue/test-virt-rescue-suggest.sh
index f3fbebc..c3f5d91 100755
--- a/rescue/test-virt-rescue-suggest.sh
+++ b/rescue/test-virt-rescue-suggest.sh
@@ -28,8 +28,11 @@ fi
 
 rm -f virt-rescue-suggest.out
 
-$VG ./virt-rescue --suggest "$guest" > virt-rescue-suggest.out
-if [ "$(grep '^mount ' virt-rescue-suggest.out)" != "mount /dev/VG/Root /sysroot/
+$VG ./virt-rescue --suggest "$guest" |
+  grep '^mount ' |
+  sed -r 's,/dev/[abce-ln-z]+d,/dev/sd,' > virt-rescue-suggest.out
+
+if [ "$(cat virt-rescue-suggest.out)" != "mount /dev/VG/Root /sysroot/
 mount /dev/sda1 /sysroot/boot
 mount --bind /dev /sysroot/dev
 mount --bind /dev/pts /sysroot/dev/pts

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git