From 0ab268ee5f3ae1db199200091d694cf12bc76064 Mon Sep 17 00:00:00 2001
From: root
Date: Wed, 11 Aug 2010 20:17:59 +0200
Subject: .. we have working packages :)

---
 inc/chroot-functions.inc.sh | 2 ++
 inc/env.inc.sh              | 2 +-
 inc/helper.inc.sh           | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'inc')

diff --git a/inc/chroot-functions.inc.sh b/inc/chroot-functions.inc.sh
index 35f2589..7eb566c 100644
--- a/inc/chroot-functions.inc.sh
+++ b/inc/chroot-functions.inc.sh
@@ -2,6 +2,8 @@ chroot-exec () {
   export HOME="/root"
   if [ $(mount |grep -c $BROOT_BUILDROOT_PATH/dev) -eq 0 ]; then
     setupBindmounts
+  else 
+    echo "found existing mounts skipping mount setup"
   fi
   chroot $BROOT_BUILDROOT_PATH linux32 $@
 }
diff --git a/inc/env.inc.sh b/inc/env.inc.sh
index 34e9c5b..52284d5 100644
--- a/inc/env.inc.sh
+++ b/inc/env.inc.sh
@@ -1,6 +1,6 @@
 slxsettings=$(slxsettings 2>/dev/null )
 if [ $? -eq 0 ]; then
-  BROOT_BUILDROOT_PATH=$(slxsettings |grep public-path | sed -e "s,^.*='\(.*\)'$,\1,")
+  BROOT_BUILDROOT_PATH=$(slxsettings |grep private-path | sed -e "s,^.*='\(.*\)'$,\1,")
   BROOT_BUILDROOT_PATH="$BROOT_BUILDROOT_PATH/buildroot"
 else 
   BROOT_BUILDROOT_PATH="/tmp/buildroot"
diff --git a/inc/helper.inc.sh b/inc/helper.inc.sh
index 6f63dfe..d51aac2 100644
--- a/inc/helper.inc.sh
+++ b/inc/helper.inc.sh
@@ -1,7 +1,7 @@
 
 setupBindmounts() {
-  mount -o bind /proc $BROOT_BUILDROOT_PATH/proc
-  mount -t devtmpfs dev $BROOT_BUILDROOT_PATH/dev
+  mount -t proc proc $BROOT_BUILDROOT_PATH/proc
+  mount -t tmpfs dev $BROOT_BUILDROOT_PATH/dev
   chroot $BROOT_BUILDROOT_PATH mount -t devpts devpts /dev/pts
   [ "x$(cat /proc/mounts | grep -q "/tmp/deb")" == "x" ] && mount -o bind /tmp/deb $BROOT_BUILDROOT_PATH/var/cache/apt/archives
 }
-- 
cgit v1.2.3-55-g7522