From 1c27326486cebbcca64c4eeba7cb035639ed48f6 Mon Sep 17 00:00:00 2001
From: Sebastian Schmelzer
Date: Fri, 11 Nov 2011 15:24:25 +0100
Subject: minor fixes

---
 inc/chroot-functions.inc.sh | 2 +-
 inc/helper.inc.sh           | 2 +-
 tasks/bootstrap.task.sh     | 2 +-
 tasks/update.task.sh        | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/inc/chroot-functions.inc.sh b/inc/chroot-functions.inc.sh
index 7eb566c..383d31d 100644
--- a/inc/chroot-functions.inc.sh
+++ b/inc/chroot-functions.inc.sh
@@ -13,5 +13,5 @@ chroot-aptinstall () {
   if [ $(mount |grep -c $BROOT_BUILDROOT_PATH/dev) -eq 0 ]; then
     setupBindmounts
   fi
-  chroot $BROOT_BUILDROOT_PATH linux32 aptitude install -y $@
+  chroot $BROOT_BUILDROOT_PATH linux32 apt-get install -y $@
 }
diff --git a/inc/helper.inc.sh b/inc/helper.inc.sh
index 5d600ea..10f15ee 100644
--- a/inc/helper.inc.sh
+++ b/inc/helper.inc.sh
@@ -1,7 +1,7 @@
 
 setupBindmounts() {
   mount -t proc proc $BROOT_BUILDROOT_PATH/proc
-  mount -t tmpfs dev $BROOT_BUILDROOT_PATH/dev
+  mount -o bind /dev $BROOT_BUILDROOT_PATH/dev
   [ ! -f $BROOT_BUILDROOT_PATH/dev/pts ] && mkdir -p $BROOT_BUILDROOT_PATH/dev/pts
   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
diff --git a/tasks/bootstrap.task.sh b/tasks/bootstrap.task.sh
index 2f0624b..7372c7e 100644
--- a/tasks/bootstrap.task.sh
+++ b/tasks/bootstrap.task.sh
@@ -42,6 +42,6 @@ bootstrap () {
 
   echo "  update package list"
   # update package list
-  chroot-exec aptitude update >> $BROOT_LOG.$ME
+  chroot-exec apt-get update >> $BROOT_LOG.$ME
   echo "  finished all for bootstrap"
 }
diff --git a/tasks/update.task.sh b/tasks/update.task.sh
index f6ec089..de1c5b1 100644
--- a/tasks/update.task.sh
+++ b/tasks/update.task.sh
@@ -3,8 +3,8 @@ update_package_dependencies="bootstrap"
 update() {
   ME=update
   echo "  Refresh apt sources"
-  chroot-exec aptitude update > $DEBUG.$ME 2>&1
+  chroot-exec apt-get update > $DEBUG.$ME 2>&1
   echo -n "  Running system update "
-  chroot-exec aptitude -y safe-upgrade | tee -a - $DEBUG.$ME | awk '{printf "."}' 2>&1
+  chroot-exec apt-get -y upgrade | tee -a - $DEBUG.$ME | awk '{printf "."}' 2>&1
   echo "done"
 }
-- 
cgit v1.2.3-55-g7522