[27141] in Source-Commits
/svn/athena r25969 - trunk/debathena/scripts/build-server
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Thu May 9 16:16:49 2013
Date: Thu, 9 May 2013 16:16:38 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201305092016.r49KGcDS006970@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2013-05-09 16:16:38 -0400 (Thu, 09 May 2013)
New Revision: 25969
Modified:
trunk/debathena/scripts/build-server/make-chroot
Log:
- Try the new location for DATA first, then fallback (and warn)
to dirname $0
- Add a script-config directive to support the new profile for overlayfs
chroots (rather than screwing with mount-defaults)
Modified: trunk/debathena/scripts/build-server/make-chroot
===================================================================
--- trunk/debathena/scripts/build-server/make-chroot 2013-05-08 21:18:14 UTC (rev 25968)
+++ trunk/debathena/scripts/build-server/make-chroot 2013-05-09 20:16:38 UTC (rev 25969)
@@ -39,7 +39,11 @@
: ${VG=/dev/builder}
: ${CHROOTDIR=/srv}
: ${MIRRORHOST=localhost:9999}
-: ${DATA="$(dirname "$0")"}
+: ${DATA="/usr/share/debathena-build-server"}
+if [ ! -d "$DATA" ]; then
+ DATA="$(dirname "$0")"
+ echo "WARNING: Falling back to DATA=$DATA" >&2
+fi
SUITE=$1
ARCH=$2
CHROOT="${SUITE}-${ARCH}-sbuild"
@@ -112,7 +116,7 @@
mount "$DEVICE" "$TARGET"
else
TARGET="$TMPDIR/root"
- SCRIPTCFG="default/config"
+ SCRIPTCFG="debathena/config"
fi
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/"
@@ -123,7 +127,7 @@
# config that bind-mounts /run/shm instead of /dev/shm
if [ -L "$TARGET/dev/shm" ] &&
[ "$(readlink "$TARGET/dev/shm")" = "/run/shm" ]; then
- SCRIPTCFG="default/config-slash-run"
+ SCRIPTCFG="debathena/config-slash-run"
else
mkdir -p "$TARGET/dev/shm"
fi
@@ -150,6 +154,7 @@
groups=root,sbuild
root-groups=root,sbuild
source-groups=root
+script-config=$SCRIPTCFG
device=$DEVICE
personality=$PERSONALITY
EOF
