|
 |
e76f14 |
From 74c5a924edaf9abdb1f6998658d2035f3c9496a8 Mon Sep 17 00:00:00 2001
|
|
|
e76f14 |
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
e76f14 |
Date: Thu, 24 Mar 2016 17:58:42 +0000
|
|
|
e76f14 |
Subject: [PATCH] rescue: Fix test to deal with new --suggest output.
|
|
|
e76f14 |
|
|
|
e76f14 |
Fixed commit 72fd0531ab8446dc00d565cf2f526f5c9bcee968.
|
|
|
e76f14 |
|
|
|
e76f14 |
(cherry picked from commit c3fb5deab693c0e193a684f7aba21785a8795828)
|
|
|
e76f14 |
---
|
|
|
e76f14 |
rescue/test-virt-rescue-suggest.sh | 7 +++----
|
|
|
e76f14 |
1 file changed, 3 insertions(+), 4 deletions(-)
|
|
|
e76f14 |
|
|
|
e76f14 |
diff --git a/rescue/test-virt-rescue-suggest.sh b/rescue/test-virt-rescue-suggest.sh
|
|
|
e76f14 |
index e3cb59d..a8b41e2 100755
|
|
|
e76f14 |
--- a/rescue/test-virt-rescue-suggest.sh
|
|
|
e76f14 |
+++ b/rescue/test-virt-rescue-suggest.sh
|
|
|
e76f14 |
@@ -34,10 +34,9 @@ $VG virt-rescue --suggest --format=raw -a "$guest" |
|
|
|
e76f14 |
|
|
|
e76f14 |
if [ "$(cat virt-rescue-suggest.out)" != "mount /dev/VG/Root /sysroot/
|
|
|
e76f14 |
mount /dev/sda1 /sysroot/boot
|
|
|
e76f14 |
-mount --bind /dev /sysroot/dev
|
|
|
e76f14 |
-mount --bind /dev/pts /sysroot/dev/pts
|
|
|
e76f14 |
-mount --bind /proc /sysroot/proc
|
|
|
e76f14 |
-mount --bind /sys /sysroot/sys" ]; then
|
|
|
e76f14 |
+mount --rbind /dev /sysroot/dev
|
|
|
e76f14 |
+mount --rbind /proc /sysroot/proc
|
|
|
e76f14 |
+mount --rbind /sys /sysroot/sys" ]; then
|
|
|
e76f14 |
echo "$0: unexpected output from virt-rescue --suggest command:"
|
|
|
e76f14 |
cat virt-rescue-suggest.out
|
|
|
e76f14 |
exit 1
|
|
|
e76f14 |
--
|
|
|
aa0300 |
2.7.4
|
|
|
e76f14 |
|