From 27b3a90b478503fbdef41048bacc32a08f3e5c19 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Wed, 8 Apr 2009 15:52:00 +0000
Subject: [PATCH] copy in /bin/mount-static if existing

---
 build            | 2 +-
 init_buildsystem | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/build b/build
index 1315178..f713017 100755
--- a/build
+++ b/build
@@ -1022,7 +1022,7 @@ for SPECFILE in "${SPECFILES[@]}" ; do
 		# to run the qemu initialization in the XEN chroot, we need to register it with a statically build shell
 		if [ x"$BUILD_ARCH" == xarmv4l -o x"$BUILD_ARCH" == xarmv5el -o x"$BUILD_ARCH" == xarmv7el -o x"$BUILD_ARCH" == xsh4 -o x"$BUILD_ARCH" == xppc ]; then
 		    if [ x"`uname -i`" == xx86_64 -o  x"`uname -i`" == xi386 ]; then
-			if [ -e /bin/bash-static ]; then
+			if [ -e /bin/bash-static -a -e /bin/mount-static ]; then
 			    CROSS_INIT_SCRIPT="/.build/build.cross"
 			fi
 		    fi
diff --git a/init_buildsystem b/init_buildsystem
index 9002e0e..dee3696 100755
--- a/init_buildsystem
+++ b/init_buildsystem
@@ -282,8 +282,8 @@ if [ x"$BUILD_ARCH" == xarmv4l -o x"$BUILD_ARCH" == xarmv5el -o x"$BUILD_ARCH" =
             (mkdir -p  $BUILD_ROOT/usr/bin $BUILD_ROOT/usr/sbin && set -x && cp /usr/bin/qemu-* $BUILD_ROOT/usr/bin && cp /usr/sbin/qemu-binfmt-conf.sh $BUILD_ROOT/usr/sbin)
         fi
         # To initially run the init script, there needs to be also a static bash to register qemu in this chroot and though to start up /.build/build
-	if [ -e /bin/bash-static ]; then 
-            (mkdir -p  $BUILD_ROOT/bin && set -x && cp /bin/bash-static $BUILD_ROOT/bin)
+	if [ -e /bin/bash-static -a -e /bin/mount-static ]; then 
+            (mkdir -p  $BUILD_ROOT/bin && set -x && cp /bin/bash-static $BUILD_ROOT/bin && cp /bin/mount-static $BUILD_ROOT/bin)
         fi
         if [ -e /proc/sys/fs/binfmt_misc/arm -o -e /proc/sys/fs/binfmt_misc/armeb -o -e /proc/sys/fs/binfmt_misc/sh4 ]; then
             echo "qemu-* already registered"
@@ -291,6 +291,7 @@ if [ x"$BUILD_ARCH" == xarmv4l -o x"$BUILD_ARCH" == xarmv5el -o x"$BUILD_ARCH" =
 	    if [ -e /usr/sbin/qemu-binfmt-conf.sh ]; then
 		echo "qemu-* will be registered"
 		if [ -e /bin/bash-static ]; then
+                    # should not be needed in XEN, because already done via build.cross
 		    (set -x && bash-static /usr/sbin/qemu-binfmt-conf.sh)
 		else
 		    (set -x && sh /usr/sbin/qemu-binfmt-conf.sh)
-- 
2.7.4