From 8e758de87eddd92ce95f8db18453cc46dba3438c48782b22cbf10c707d356235 Mon Sep 17 00:00:00 2001
From: Olaf Hering <ohering@suse.com>
Date: Mon, 24 Sep 2012 09:02:45 +0000
Subject: [PATCH] - update mount-rootfs-and-do-chroot.sh, avoid bind mount
 errors

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=106
---
 libguestfs.changes           | 5 +++++
 libguestfs.mkinitrd.boot.sh  | 1 +
 libguestfs.mkinitrd.setup.sh | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/libguestfs.changes b/libguestfs.changes
index 5295742..1585cc8 100644
--- a/libguestfs.changes
+++ b/libguestfs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep 24 11:01:57 CEST 2012 - ohering@suse.de
+
+- update mount-rootfs-and-do-chroot.sh, avoid bind mount errors
+
 -------------------------------------------------------------------
 Sat Sep 22 15:33:31 CEST 2012 - ohering@suse.de
 
diff --git a/libguestfs.mkinitrd.boot.sh b/libguestfs.mkinitrd.boot.sh
index 6d913e8..4329223 100644
--- a/libguestfs.mkinitrd.boot.sh
+++ b/libguestfs.mkinitrd.boot.sh
@@ -92,6 +92,7 @@
 #%programs: setctsid
 # mount-rootfs-and-do-chroot.sh
 #%programs: mkdir
+#%programs: stat
 #%programs: mount
 #%programs: chroot
 #%programs: umount
diff --git a/libguestfs.mkinitrd.setup.sh b/libguestfs.mkinitrd.setup.sh
index c8220f6..88a667d 100644
--- a/libguestfs.mkinitrd.setup.sh
+++ b/libguestfs.mkinitrd.setup.sh
@@ -58,7 +58,7 @@ then
 
 		for i in dev proc sys selinux
 		do
-			if test -d /${i} && test -d "${mnt}/${i}"
+			if test -d /${i} && test -d "${mnt}/${i}" && test "`stat -c %D /`" != "`stat -c %D ${i}`"
 			then
 				mount -v --bind /${i} "${mnt}/${i}"
 			fi