[27144] in Source-Commits
/svn/athena r25972 - trunk/debathena/scripts/build-server
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Fri May 10 11:37:03 2013
Date: Fri, 10 May 2013 11:36:55 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201305101536.r4AFatC0021813@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2013-05-10 11:36:55 -0400 (Fri, 10 May 2013)
New Revision: 25972
Modified:
trunk/debathena/scripts/build-server/make-chroot
Log:
- Add a success message at the end of the script.
- Specify the apt key with a variable.
- Use the key in /usr/share/keyrings rather than shipping a separate copy
Modified: trunk/debathena/scripts/build-server/make-chroot
===================================================================
--- trunk/debathena/scripts/build-server/make-chroot 2013-05-10 15:19:30 UTC (rev 25971)
+++ trunk/debathena/scripts/build-server/make-chroot 2013-05-10 15:36:55 UTC (rev 25972)
@@ -40,6 +40,9 @@
: ${CHROOTDIR=/srv}
: ${MIRRORHOST=localhost:9999}
: ${DATA="/usr/share/debathena-build-server"}
+# This used to include its own copy of the key, we now just use the
+# one from archive-keyring
+: ${APTKEY="/usr/share/keyrings/debathena-archive-keyring.gpg"}
if [ ! -d "$DATA" ]; then
DATA="$(dirname "$0")"
echo "WARNING: Falling back to DATA=$DATA" >&2
@@ -175,7 +178,7 @@
schroot --chroot="${CHROOT}-source" --directory=/ -- /bin/sh -xe - \
8< "$SOURCES" \
- 9< "$DATA/debathena-archive.asc" \
+ 9< "$APTKEY" \
<<EOF
#/debootstrap/debootstrap --second-stage
dpkg-divert --local --rename --add /sbin/initctl
@@ -188,3 +191,5 @@
apt-get -q -y update
apt-get -q -y dist-upgrade
EOF
+echo "Done: $CHROOT created successfully."
+exit 0
\ No newline at end of file
