summaryrefslogtreecommitdiffstats
path: root/inc
diff options
context:
space:
mode:
authorschmelzs2010-02-25 19:37:32 +0100
committerschmelzs2010-02-25 19:37:32 +0100
commitf686127ede6a740e0b9094df8c6e6454137bc53f (patch)
tree100c5b72a75e1e2f8f3e8dc621e59105b454031e /inc
parentmove default path from openslx-base-path to public-path due problems (diff)
downloadbroot-f686127ede6a740e0b9094df8c6e6454137bc53f.tar.gz
broot-f686127ede6a740e0b9094df8c6e6454137bc53f.tar.xz
broot-f686127ede6a740e0b9094df8c6e6454137bc53f.zip
added bootstrap 1.0.22
Diffstat (limited to 'inc')
-rw-r--r--inc/bootstrap.inc.sh2
-rw-r--r--inc/chroot-functions.inc.sh4
2 files changed, 3 insertions, 3 deletions
diff --git a/inc/bootstrap.inc.sh b/inc/bootstrap.inc.sh
index 2eabf54..c7965bd 100644
--- a/inc/bootstrap.inc.sh
+++ b/inc/bootstrap.inc.sh
@@ -12,7 +12,7 @@ bootstrap () {
echo -en "${R}1${NONE} " && sleep 1 && \
echo ".. go "
- debootstrap squeeze $buildrootpath http://ftp.de.debian.org/debian
+ debootstrap --arch="i386" squeeze $buildrootpath http://ftp.de.debian.org/debian
touch $buildrootpath/bootstraped
sed -i -e "s,main,main non-free," $buildrootpath/etc/apt/sources.list
setupBindmounts $buildrootpath
diff --git a/inc/chroot-functions.inc.sh b/inc/chroot-functions.inc.sh
index 2578e15..b07f3ea 100644
--- a/inc/chroot-functions.inc.sh
+++ b/inc/chroot-functions.inc.sh
@@ -2,12 +2,12 @@ chroot-exec () {
if [ $(mount |grep -c $buildrootpath/dev) -eq 0 ]; then
setupBindmounts
fi
- chroot $buildrootpath $@
+ chroot $buildrootpath linux32 $@
}
chroot-aptinstall () {
if [ $(mount |grep -c $buildrootpath/dev) -eq 0 ]; then
setupBindmounts
fi
- chroot $buildrootpath aptitude install -y $@
+ chroot $buildrootpath linux32 aptitude install -y $@
}