X-Git-Url: https://piware.de/gitweb/?p=bin.git;a=blobdiff_plain;f=makechroot;h=76201b1e97616558ed649a310dfc0d71618f5052;hp=c7dfd668fb11796d1cb45db51afb7d8cee6420dd;hb=4f3fa2a9d54689cd022d3aaea7812bfd54faf767;hpb=167f1d11eac547844ba046f36dc4f0d2257c6e08

diff --git a/makechroot b/makechroot
index c7dfd66..76201b1 100755
--- a/makechroot
+++ b/makechroot
@@ -3,40 +3,33 @@ DIST="$1"
 DIR="$2"
 MIRROR="$3"
 
-debootstrap "$DIST" "$DIR" $MIRROR
+[ "$DIST" ] && [ "$DIR" ] && [ "$MIRROR" ] || {
+    echo "Usage: $0 <dist> <directory> <mirror>" >&2
+    exit 1
+}
 
-# apt sources
-cat <<EOF > $DIR/etc/apt/sources.list
-deb     $MIRROR $DIST main restricted universe multiverse
-deb-src $MIRROR $DIST main restricted universe multiverse
-deb     $MIRROR $DIST-updates main restricted universe multiverse
-deb-src $MIRROR $DIST-updates main restricted universe multiverse
-deb     $MIRROR $DIST-proposed main restricted universe multiverse
-deb-src $MIRROR $DIST-proposed main restricted universe multiverse
-deb     $MIRROR $DIST-security main restricted universe multiverse
-deb-src $MIRROR $DIST-security main restricted universe multiverse
-EOF
-
-chroot $DIR apt-get update
-
-# common packages for development
-chroot $DIR apt-get install -y build-essential devscripts fakeroot
+mkdir -p "$DIR"
+debootstrap "$DIST" "$DIR" "$MIRROR"
+chroot $DIR apt-get install locales
 
 # debian_chroot
 echo $DIST > $DIR/etc/debian_chroot
 
+# hosts
+echo "127.0.0.1 localhost.localdomain localhost" > $DIR/etc/hosts
+
 # users
 perl -naF: -e 'print if $F[2] >= 1000 and $F[2] < 2000' /etc/passwd >> $DIR/etc/passwd
 
 # locale
-chroot $DIR locale-gen $LANG
+chroot $DIR locale-gen $LANG
 
 # bind mounts
 if ! grep -q $DIR /etc/fstab; then
     cat <<EOF >> /etc/fstab
 
 # $DIST chroot
-/home           $DIR/home none    bind    0 0
+/home           $DIR/home none    rbind   0 0
 /proc           $DIR/proc none    bind    0 0
 /sys            $DIR/sys  none    bind    0 0
 /tmp            $DIR/tmp  none    bind    0 0
@@ -47,3 +40,24 @@ EOF
     mount $DIR/tmp
 fi
 
+# apt sources
+if [ "$MIRROR" != "${MIRROR%file://}" ]; then
+    MIRROR=http://archive.ubuntu.com/ubuntu
+fi
+
+cat <<EOF > $DIR/etc/apt/sources.list
+deb     $MIRROR $DIST main restricted universe multiverse
+deb-src $MIRROR $DIST main restricted universe multiverse
+deb     $MIRROR $DIST-updates main restricted universe multiverse
+deb-src $MIRROR $DIST-updates main restricted universe multiverse
+deb     $MIRROR $DIST-proposed main restricted universe multiverse
+deb-src $MIRROR $DIST-proposed main restricted universe multiverse
+deb     $MIRROR $DIST-security main restricted universe multiverse
+deb-src $MIRROR $DIST-security main restricted universe multiverse
+EOF
+
+chroot $DIR apt-get update
+
+# common packages for development
+chroot $DIR apt-get install -y build-essential fakeroot
+