[26239] in Source-Commits
/svn/athena r25470 - trunk/debathena/scripts/build-server
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Sun Apr 29 01:19:24 2012
Date: Sun, 29 Apr 2012 01:19:22 -0400
From: Geoffrey Thomas <geofft@MIT.EDU>
Message-Id: <201204290519.q3T5JMR5003251@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: geofft
Date: 2012-04-29 01:19:22 -0400 (Sun, 29 Apr 2012)
New Revision: 25470
Modified:
trunk/debathena/scripts/build-server/make-chroot
Log:
Switch to tar-based chroots (Trac: #873)
Modified: trunk/debathena/scripts/build-server/make-chroot
===================================================================
--- trunk/debathena/scripts/build-server/make-chroot 2012-04-29 03:37:10 UTC (rev 25469)
+++ trunk/debathena/scripts/build-server/make-chroot 2012-04-29 05:19:22 UTC (rev 25470)
@@ -8,11 +8,9 @@
set -xe
-: ${VG=/dev/dink}
SUITE=$1
ARCH=$2
CHROOT="${SUITE}-${ARCH}-sbuild"
-DEVICE="$VG/$CHROOT"
SIZE=4G
exittrap() { :; }
@@ -53,33 +51,28 @@
exit 1
fi
-lvcreate --size "$SIZE" --name "$CHROOT" "$VG"
-mkfs.ext3 "$DEVICE"
-tune2fs -c 0 -i 0 "$DEVICE"
-
exittrap() { umount "$TARGET" || :; rmdir "$TARGET" || :; }
TARGET=$(mktemp -dt make-chroot.XXXXXX)
-mount "$DEVICE" "$TARGET"
debootstrap --variant=buildd --include=apt,apt-utils,gnupg,build-essential,fakeroot --arch "$ARCH" "$SUITE" "$TARGET" "$MIRROR"
install -m a=rx,u+w "$DATA/policy-rc.d" "$TARGET/usr/sbin/"
mkdir -p "$TARGET/dev/pts"
mkdir -p "$TARGET/dev/shm"
mkdir -p "$TARGET/afs"
mkdir -p "$TARGET/mit"
-umount "$TARGET"
-rmdir "$TARGET"
+tar cjf /srv/"$CHROOT".tar.bz2 "$TARGET"
+rm -rf "$TARGET"
exittrap() { :; }
! [ -s "$CONF" ] || echo >> "$CONF"
cat >> "$CONF" <<EOF
[$CHROOT]
-type=block-device
-union-type=aufs
+type=file
description=$CHROOT
groups=root,sbuild
root-groups=root,sbuild
source-groups=root
-device=$DEVICE
+file=/srv/$CHROOT.tar.bz2
+location=$TARGET
personality=$PERSONALITY
EOF
