[26847] in Source-Commits
/svn/athena r25791 - trunk/debathena/scripts/build-server
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Thu Oct 25 11:45:25 2012
Date: Thu, 25 Oct 2012 11:45:18 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201210251545.q9PFjI0o025541@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-10-25 11:45:18 -0400 (Thu, 25 Oct 2012)
New Revision: 25791
Modified:
trunk/debathena/scripts/build-server/make-chroot
Log:
- Use a less stupid VG name
- Swap the chroot config conditional blocks, which were in the wrong order
Modified: trunk/debathena/scripts/build-server/make-chroot
===================================================================
--- trunk/debathena/scripts/build-server/make-chroot 2012-10-25 15:23:51 UTC (rev 25790)
+++ trunk/debathena/scripts/build-server/make-chroot 2012-10-25 15:45:18 UTC (rev 25791)
@@ -29,7 +29,7 @@
set -xe
-: ${VG=/dev/dink}
+: ${VG=/dev/builder}
: ${CHROOTDIR=/srv}
: ${MIRRORHOST=localhost:9999}
: ${DATA="$(dirname "$0")"}
@@ -137,26 +137,26 @@
if [ "$TYPE" = "overlayfs" ]; then
cat >> "$CONF" <<EOF
[$CHROOT]
-type=file
+type=block-device
+union-type=overlayfs
description=$CHROOT
groups=root,sbuild
root-groups=root,sbuild
source-groups=root
-script-config=$SCRIPTCFG
-file=$FILE
-location=/root
+device=$DEVICE
personality=$PERSONALITY
EOF
else
cat >> "$CONF" <<EOF
[$CHROOT]
-type=block-device
-union-type=overlayfs
+type=file
description=$CHROOT
groups=root,sbuild
root-groups=root,sbuild
source-groups=root
-device=$DEVICE
+script-config=$SCRIPTCFG
+file=$FILE
+location=/root
personality=$PERSONALITY
EOF
fi
