mrc0mmand / rpms / libguestfs

Forked from rpms/libguestfs 3 years ago
Clone
Blob Blame History Raw
From 74c5a924edaf9abdb1f6998658d2035f3c9496a8 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 24 Mar 2016 17:58:42 +0000
Subject: [PATCH] rescue: Fix test to deal with new --suggest output.

Fixed commit 72fd0531ab8446dc00d565cf2f526f5c9bcee968.

(cherry picked from commit c3fb5deab693c0e193a684f7aba21785a8795828)
---
 rescue/test-virt-rescue-suggest.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/rescue/test-virt-rescue-suggest.sh b/rescue/test-virt-rescue-suggest.sh
index e3cb59d..a8b41e2 100755
--- a/rescue/test-virt-rescue-suggest.sh
+++ b/rescue/test-virt-rescue-suggest.sh
@@ -34,10 +34,9 @@ $VG virt-rescue --suggest --format=raw -a "$guest" |
 
 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
-mount --bind /proc /sysroot/proc
-mount --bind /sys /sysroot/sys" ]; then
+mount --rbind /dev /sysroot/dev
+mount --rbind /proc /sysroot/proc
+mount --rbind /sys /sysroot/sys" ]; then
     echo "$0: unexpected output from virt-rescue --suggest command:"
     cat virt-rescue-suggest.out
     exit 1
-- 
2.7.4