[25605] in Source-Commits
/svn/athena r25118 - trunk/debathena/scripts
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Fri Apr 29 18:45:43 2011
Date: Fri, 29 Apr 2011 18:45:37 -0400
From: Geoffrey Thomas <geofft@MIT.EDU>
Message-Id: <201104292245.p3TMjb7I011260@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: geofft
Date: 2011-04-29 18:45:37 -0400 (Fri, 29 Apr 2011)
New Revision: 25118
Modified:
trunk/debathena/scripts/daschroot
Log:
daschroot: Let chroot-sources know what dist we want
Modified: trunk/debathena/scripts/daschroot
===================================================================
--- trunk/debathena/scripts/daschroot 2011-04-29 22:37:23 UTC (rev 25117)
+++ trunk/debathena/scripts/daschroot 2011-04-29 22:45:37 UTC (rev 25118)
@@ -2,18 +2,19 @@
#
# Gives you an interactive shell with Debathena repositories configured
-chroot=$1
-if [ -z "$chroot" ]; then
- echo "usage: daschroot <chroot name>"
+if [ -z "$1" ] || [ -z "$2" ]; then
+ echo "usage: daschroot <dist> <arch>"
exit 1
fi
-shift
+dist="$1"
+arch="$2"
+shift 2
-if ! schroot -c "$chroot" -i >/dev/null; then
+if ! schroot -c "$dist-$arch-sbuild" -i >/dev/null; then
exit $?
fi
-session=$(schroot -c "$chroot" -b)
-schroot -c "$session" -r -u root -- "$(readlink -f "$(dirname "$0")/chroot-sources")"
+session=$(schroot -c "$dist-$arch-sbuild" -b)
+schroot -c "$session" -r -u root -- env SBUILD_BUILD_CONF_DISTRIBUTION="$dist" "$(readlink -f "$(dirname "$0")/chroot-sources")"
schroot -c "$session" -r "$@"
schroot -c "$session" -e
