[Collab-qa-commits] r650 - in debcluster/configs/schroot: . exec.d setup.d
lucas at alioth.debian.org
lucas at alioth.debian.org
Wed Jan 16 10:04:39 UTC 2008
Author: lucas
Date: 2008-01-16 10:04:39 +0000 (Wed, 16 Jan 2008)
New Revision: 650
Added:
debcluster/configs/schroot/script-defaults
debcluster/configs/schroot/setup.d/15killprocs
Modified:
debcluster/configs/schroot/exec.d/00check
debcluster/configs/schroot/schroot.conf
debcluster/configs/schroot/setup.d/00check
debcluster/configs/schroot/setup.d/05file
debcluster/configs/schroot/setup.d/05lvm
debcluster/configs/schroot/setup.d/10mount
debcluster/configs/schroot/setup.d/20network
debcluster/configs/schroot/setup.d/30passwd
debcluster/configs/schroot/setup.d/50chrootname
debcluster/configs/schroot/setup.d/50sbuild
Log:
schroot/sbuild update
Modified: debcluster/configs/schroot/exec.d/00check
===================================================================
--- debcluster/configs/schroot/exec.d/00check 2008-01-16 10:03:32 UTC (rev 649)
+++ debcluster/configs/schroot/exec.d/00check 2008-01-16 10:04:39 UTC (rev 650)
@@ -1,5 +1,9 @@
#!/bin/sh
+if [ -f "$CHROOT_SCRIPT_CONFIG" ]; then
+ . "$CHROOT_SCRIPT_CONFIG"
+fi
+
if [ $1 = "exec-start" ]; then
if [ "$AUTH_VERBOSITY" = "verbose" ]; then
@@ -12,6 +16,7 @@
echo "CHROOT_TYPE=$CHROOT_TYPE"
echo "CHROOT_NAME=$CHROOT_NAME"
echo "CHROOT_DESCRIPTION=$CHROOT_DESCRIPTION"
+ echo "CHROOT_SCRIPT_CONFIG=$CHROOT_SCRIPT_CONFIG"
echo "CHROOT_MOUNT_LOCATION=$CHROOT_MOUNT_LOCATION"
echo "CHROOT_LOCATION=$CHROOT_LOCATION"
echo "CHROOT_PATH=$CHROOT_PATH"
@@ -30,6 +35,7 @@
echo "CHROOT_LVM_SNAPSHOT_OPTIONS=$CHROOT_LVM_SNAPSHOT_OPTIONS"
fi
fi
+ echo "SBUILD=$SBUILD"
fi
fi
Modified: debcluster/configs/schroot/schroot.conf
===================================================================
--- debcluster/configs/schroot/schroot.conf 2008-01-16 10:03:32 UTC (rev 649)
+++ debcluster/configs/schroot/schroot.conf 2008-01-16 10:04:39 UTC (rev 650)
@@ -78,6 +78,15 @@
run-setup-scripts=true
root-users=user
+[sid32-dash]
+type=file
+description=Debian sid 32 bits
+file=/debcluster-data/chroots/sid32-dash.tgz
+priority=2
+run-setup-scripts=true
+personality=linux32
+root-users=user
+
[sid32]
type=file
description=Debian sid 32 bits
@@ -86,85 +95,129 @@
run-setup-scripts=true
personality=linux32
root-users=user
+aliases=unstable
-[etch32-piuparts]
+[sid32-gcc43]
type=file
description=Debian sid 32 bits
-file=/debcluster-data/chroots/etch32-piuparts.tgz
+file=/debcluster-data/chroots/sid32-gcc43.tgz
priority=2
run-setup-scripts=true
personality=linux32
root-users=user
-[gutsy32]
+[sid32h]
type=file
description=Debian sid 32 bits
-file=/debcluster-data/chroots/gutsy32.tgz
+file=/debcluster-data/chroots/sid32h.tgz
priority=2
run-setup-scripts=true
personality=linux32
root-users=user
-[feisty32]
+[lenny32]
type=file
description=Debian sid 32 bits
-file=/debcluster-data/chroots/feisty32.tgz
+file=/debcluster-data/chroots/lenny32.tgz
priority=2
run-setup-scripts=true
personality=linux32
root-users=user
-[sid32-piuparts]
+[etch32]
type=file
description=Debian sid 32 bits
-file=/debcluster-data/chroots/sid32-piuparts.tgz
+file=/debcluster-data/chroots/etch32.tgz
priority=2
run-setup-scripts=true
personality=linux32
root-users=user
-[sid32-bdfh]
-type=directory
+[etch32-piuparts]
+type=file
description=Debian sid 32 bits
-location=/mnt/bdfh-tmp
+file=/debcluster-data/chroots/etch32-piuparts.tgz
priority=2
run-setup-scripts=true
personality=linux32
root-users=user
-[sid32-bdfh-src]
-type=directory
+[gutsy32-g43]
+type=file
description=Debian sid 32 bits
-location=/mnt/root-bdfh
+file=/debcluster-data/chroots/gutsy32-g43.tgz
priority=2
run-setup-scripts=true
personality=linux32
root-users=user
+[gutsylp-g43]
+type=file
+description=Debian sid 32 bits
+file=/debcluster-data/chroots/gutsylp-g43.tgz
+priority=2
+run-setup-scripts=true
+personality=linux32
+root-users=user
-[sid32-ba]
+[gutsy64-g43]
type=file
description=Debian sid 32 bits
-file=/debcluster-data/chroots/sid32-ba.tgz
+file=/debcluster-data/chroots/gutsy64-g43.tgz
priority=2
run-setup-scripts=true
+root-users=user
+
+[gutsy32]
+type=file
+description=Debian sid 32 bits
+file=/debcluster-data/chroots/gutsy32.tgz
+priority=2
+run-setup-scripts=true
personality=linux32
root-users=user
-[sid32-sym]
+[gutsylp]
type=file
description=Debian sid 32 bits
-file=/debcluster-data/chroots/sid32-sym.tgz
+file=/debcluster-data/chroots/gutsylp.tgz
priority=2
run-setup-scripts=true
personality=linux32
root-users=user
-[sid32-gcc42]
+[gutsy64]
type=file
description=Debian sid 32 bits
-file=/debcluster-data/chroots/sid32-gcc42.tgz
+file=/debcluster-data/chroots/gutsy64.tgz
priority=2
run-setup-scripts=true
+root-users=user
+
+[sid32-piuparts]
+type=file
+description=Debian sid 32 bits
+file=/debcluster-data/chroots/sid32-piuparts.tgz
+priority=2
+run-setup-scripts=true
personality=linux32
root-users=user
+
+[sid32-bdfh]
+type=directory
+description=Debian sid 32 bits
+location=/mnt/bdfh-tmp
+priority=2
+run-setup-scripts=true
+personality=linux32
+root-users=user
+
+[sid32-bdfh-src]
+type=directory
+description=Debian sid 32 bits
+location=/mnt/root-bdfh
+priority=2
+run-setup-scripts=true
+personality=linux32
+root-users=user
+
Added: debcluster/configs/schroot/script-defaults
===================================================================
--- debcluster/configs/schroot/script-defaults (rev 0)
+++ debcluster/configs/schroot/script-defaults 2008-01-16 10:04:39 UTC (rev 650)
@@ -0,0 +1,7 @@
+# Default settings for chroot setup and exec scripts
+
+if [ -x /usr/bin/sbuild ]; then
+ SBUILD="true"
+else
+ SBUILD="false"
+fi
Modified: debcluster/configs/schroot/setup.d/00check
===================================================================
--- debcluster/configs/schroot/setup.d/00check 2008-01-16 10:03:32 UTC (rev 649)
+++ debcluster/configs/schroot/setup.d/00check 2008-01-16 10:04:39 UTC (rev 650)
@@ -1,5 +1,25 @@
#!/bin/sh
+# Copyright © 2005-2007 Roger Leigh <rleigh at debian.org>
+#
+# schroot is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# schroot is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+if [ -f "$CHROOT_SCRIPT_CONFIG" ]; then
+ . "$CHROOT_SCRIPT_CONFIG"
+fi
+
if [ $1 = "setup-start" ] || [ $1 = "setup-recover" ]; then
if [ "$AUTH_VERBOSITY" = "verbose" ]; then
@@ -12,6 +32,7 @@
echo "CHROOT_TYPE=$CHROOT_TYPE"
echo "CHROOT_NAME=$CHROOT_NAME"
echo "CHROOT_DESCRIPTION=$CHROOT_DESCRIPTION"
+ echo "CHROOT_SCRIPT_CONFIG=$CHROOT_SCRIPT_CONFIG"
echo "CHROOT_MOUNT_LOCATION=$CHROOT_MOUNT_LOCATION"
echo "CHROOT_LOCATION=$CHROOT_LOCATION"
echo "CHROOT_PATH=$CHROOT_PATH"
@@ -30,6 +51,7 @@
echo "CHROOT_LVM_SNAPSHOT_OPTIONS=$CHROOT_LVM_SNAPSHOT_OPTIONS"
fi
fi
+ echo "SBUILD=$SBUILD"
fi
case "$CHROOT_TYPE" in
Modified: debcluster/configs/schroot/setup.d/05file
===================================================================
--- debcluster/configs/schroot/setup.d/05file 2008-01-16 10:03:32 UTC (rev 649)
+++ debcluster/configs/schroot/setup.d/05file 2008-01-16 10:04:39 UTC (rev 650)
@@ -1,7 +1,27 @@
#!/bin/sh
+# Copyright © 2005-2007 Roger Leigh <rleigh at debian.org>
+#
+# schroot is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# schroot is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
set -e
+if [ -f "$CHROOT_SCRIPT_CONFIG" ]; then
+ . "$CHROOT_SCRIPT_CONFIG"
+fi
+
# Check file type
check_filetype()
{
Modified: debcluster/configs/schroot/setup.d/05lvm
===================================================================
--- debcluster/configs/schroot/setup.d/05lvm 2008-01-16 10:03:32 UTC (rev 649)
+++ debcluster/configs/schroot/setup.d/05lvm 2008-01-16 10:04:39 UTC (rev 650)
@@ -1,7 +1,27 @@
#!/bin/sh
+# Copyright © 2005-2007 Roger Leigh <rleigh at debian.org>
+#
+# schroot is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# schroot is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
set -e
+if [ -f "$CHROOT_SCRIPT_CONFIG" ]; then
+ . "$CHROOT_SCRIPT_CONFIG"
+fi
+
if [ "$AUTH_VERBOSITY" = "verbose" ]; then
VERBOSE="-v"
fi
Modified: debcluster/configs/schroot/setup.d/10mount
===================================================================
--- debcluster/configs/schroot/setup.d/10mount 2008-01-16 10:03:32 UTC (rev 649)
+++ debcluster/configs/schroot/setup.d/10mount 2008-01-16 10:04:39 UTC (rev 650)
@@ -1,7 +1,27 @@
#!/bin/sh
+# Copyright © 2005-2007 Roger Leigh <rleigh at debian.org>
+#
+# schroot is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# schroot is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
set -e
+if [ -f "$CHROOT_SCRIPT_CONFIG" ]; then
+ . "$CHROOT_SCRIPT_CONFIG"
+fi
+
# Mount a filesystem
# $1: mount options
# $2: mount device
@@ -27,13 +47,16 @@
# $1: mount base location
do_umount_all()
{
- "$LIBEXEC_DIR/schroot-listmounts" -m "$1" |
- while read mountloc; do
- if [ "$AUTH_VERBOSITY" = "verbose" ]; then
- echo "Unmounting $mountloc"
- fi
- umount "$mountloc" || exit 1
- done || exit 1
+ mounts="$("$LIBEXEC_DIR/schroot-listmounts" -m "$1")"
+ if [ "x$mounts" != 'x' ]; then
+ echo "$mounts" |
+ while read mountloc; do
+ if [ "$AUTH_VERBOSITY" = "verbose" ]; then
+ echo "Unmounting $mountloc"
+ fi
+ umount "$mountloc" || exit 1
+ done || exit 1
+ fi
}
if [ "$AUTH_VERBOSITY" = "verbose" ]; then
@@ -43,12 +66,14 @@
if [ "$CHROOT_TYPE" = "plain" ] || [ "$CHROOT_TYPE" = "directory" ] || [ "$CHROOT_TYPE" = "file" ] || [ "$CHROOT_TYPE" = "block-device" ] || [ "$CHROOT_TYPE" = "lvm-snapshot" ]; then
- if [ "$CHROOT_TYPE" = "plain" ] || [ "$CHROOT_TYPE" = "directory" ]; then
+ if [ "$CHROOT_TYPE" = "plain" ]; then
CHROOT_MOUNT_OPTIONS="--rbind"
CHROOT_MOUNT_DEVICE="$CHROOT_LOCATION"
- fi
-
- if [ "$CHROOT_TYPE" = "lvm-snapshot" ]; then
+ elif [ "$CHROOT_TYPE" = "directory" ]; then
+ CHROOT_MOUNT_OPTIONS="--bind"
+ CHROOT_MOUNT_DEVICE="$CHROOT_LOCATION"
+ elif [ "$CHROOT_TYPE" = "lvm-snapshot" ]; then
+ CHROOT_MOUNT_OPTIONS=""
CHROOT_MOUNT_DEVICE="$CHROOT_LVM_SNAPSHOT_DEVICE"
fi
@@ -77,6 +102,7 @@
if [ "$CHROOT_TYPE" != "plain" ]; then
do_mount "-t proc" "proc" "${CHROOT_PATH}/proc"
+ do_mount "-t sysfs" "sysfs" "${CHROOT_PATH}/sys"
do_mount "-o rw,bind" "/dev/pts" "${CHROOT_PATH}/dev/pts"
do_mount "-t tmpfs" "tmpfs" "${CHROOT_PATH}/dev/shm"
do_mount "-o rw,bind" "/home" "${CHROOT_PATH}/home"
Added: debcluster/configs/schroot/setup.d/15killprocs
===================================================================
--- debcluster/configs/schroot/setup.d/15killprocs (rev 0)
+++ debcluster/configs/schroot/setup.d/15killprocs 2008-01-16 10:04:39 UTC (rev 650)
@@ -0,0 +1,68 @@
+#!/bin/sh
+# Copyright © 2007 Kees Cook <kees at outflux.net>
+# Copyright © 2007 Roger Leigh <rleigh at debian.org>
+#
+# schroot is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# schroot is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+
+set -e
+
+if [ -f "$CHROOT_SCRIPT_CONFIG" ]; then
+ . "$CHROOT_SCRIPT_CONFIG"
+fi
+
+# Kill all processes that were run from within the chroot environment
+# $1: mount base location
+do_kill_all()
+{
+ if [ "$AUTH_VERBOSITY" = "verbose" ]; then
+ echo "Killing processes run inside $1"
+ fi
+ ls /proc | egrep '^[[:digit:]]+$' |
+ while read pid; do
+ root=$(readlink /proc/"$pid"/root || true)
+ if [ "$root" = "$1" ]; then
+ if [ "$AUTH_VERBOSITY" = "verbose" ]; then
+ exe=$(readlink /proc/"$pid"/exe || true)
+ echo "Killing left-over pid $pid (${exe##$1})"
+ echo " Sending SIGTERM to pid $pid"
+ fi
+ kill -TERM "$pid" 2>/dev/null
+
+ count=0
+ max=5
+ while [ -d /proc/"$pid" ]; do
+ count=$(( $count + 1 ))
+ if [ "$AUTH_VERBOSITY" = "verbose" ]; then
+ echo " Waiting for pid $pid to shut down... ($count/$max)"
+ fi
+ sleep 1
+ # Wait for $max seconds for process to die before -9'ing it
+ if [ "$count" -eq "$max" ]; then
+ if [ "$AUTH_VERBOSITY" = "verbose" ]; then
+ echo " Sending SIGKILL to pid $pid"
+ fi
+ kill -KILL "$pid" 2>/dev/null
+ sleep 1
+ break
+ fi
+ done
+ fi
+ done
+}
+
+if [ $1 = "setup-recover" ] || [ $1 = "setup-stop" ]; then
+ do_kill_all "$CHROOT_MOUNT_LOCATION"
+fi
\ No newline at end of file
Property changes on: debcluster/configs/schroot/setup.d/15killprocs
___________________________________________________________________
Name: svn:executable
+ *
Modified: debcluster/configs/schroot/setup.d/20network
===================================================================
--- debcluster/configs/schroot/setup.d/20network 2008-01-16 10:03:32 UTC (rev 649)
+++ debcluster/configs/schroot/setup.d/20network 2008-01-16 10:04:39 UTC (rev 650)
@@ -1,5 +1,25 @@
#!/bin/sh
+# Copyright © 2005-2007 Roger Leigh <rleigh at debian.org>
+#
+# schroot is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# schroot is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+if [ -f "$CHROOT_SCRIPT_CONFIG" ]; then
+ . "$CHROOT_SCRIPT_CONFIG"
+fi
+
if [ "$AUTH_VERBOSITY" = "verbose" ]; then
VERBOSE="--verbose"
fi
Modified: debcluster/configs/schroot/setup.d/30passwd
===================================================================
--- debcluster/configs/schroot/setup.d/30passwd 2008-01-16 10:03:32 UTC (rev 649)
+++ debcluster/configs/schroot/setup.d/30passwd 2008-01-16 10:04:39 UTC (rev 650)
@@ -1,5 +1,25 @@
#!/bin/sh
+# Copyright © 2005-2007 Roger Leigh <rleigh at debian.org>
+#
+# schroot is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# schroot is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+if [ -f "$CHROOT_SCRIPT_CONFIG" ]; then
+ . "$CHROOT_SCRIPT_CONFIG"
+fi
+
if [ "$AUTH_VERBOSITY" = "verbose" ]; then
VERBOSE="--verbose"
fi
Modified: debcluster/configs/schroot/setup.d/50chrootname
===================================================================
--- debcluster/configs/schroot/setup.d/50chrootname 2008-01-16 10:03:32 UTC (rev 649)
+++ debcluster/configs/schroot/setup.d/50chrootname 2008-01-16 10:04:39 UTC (rev 650)
@@ -1,8 +1,29 @@
#!/bin/sh
+# Copyright © 2005-2007 Roger Leigh <rleigh at debian.org>
+#
+# schroot is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# schroot is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+if [ -f "$CHROOT_SCRIPT_CONFIG" ]; then
+ . "$CHROOT_SCRIPT_CONFIG"
+fi
+
if [ $1 = "setup-start" ] || [ $1 = "setup-recover" ]; then
- NAME=$(echo "${CHROOT_NAME}" | sed -e 's/-[a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9]-[a-z0-9][a-z0-9][a-z0-9][a-z0-9]-[a-z0-9][a-z0-9][a-z0-9][a-z0-9]-[a-z0-9][a-z0-9][a-z0-9][a-z0-9]-[a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9]//g')
+# Strip any UUID or ISO-8601 date and pid from the chroot name
+ NAME=$(echo "${CHROOT_NAME}" | sed -e 's/-[a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9]-[a-z0-9][a-z0-9][a-z0-9][a-z0-9]-[a-z0-9][a-z0-9][a-z0-9][a-z0-9]-[a-z0-9][a-z0-9][a-z0-9][a-z0-9]-[a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9]//g' -e 's/-[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]T[0-9][0-9]:[0-9][0-9]:[0-9][0-9]Z-[0-9][0-9]*//g')
if [ "$AUTH_VERBOSITY" = "verbose" ]; then
echo "Setting chroot name to ${NAME}"
Modified: debcluster/configs/schroot/setup.d/50sbuild
===================================================================
--- debcluster/configs/schroot/setup.d/50sbuild 2008-01-16 10:03:32 UTC (rev 649)
+++ debcluster/configs/schroot/setup.d/50sbuild 2008-01-16 10:04:39 UTC (rev 650)
@@ -1,7 +1,27 @@
#!/bin/sh
+# Copyright © 2005-2007 Roger Leigh <rleigh at debian.org>
+#
+# schroot is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# schroot is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
-if [ $1 = "setup-start" ]; then
+if [ -f "$CHROOT_SCRIPT_CONFIG" ]; then
+ . "$CHROOT_SCRIPT_CONFIG"
+fi
+if [ $1 = "setup-start" ] && [ "$SBUILD" = "true" ]; then
+
# If the session user is a member of the sbuild group, make sure
# that the chroot environment has the sbuild build directory
# exists, and has the correct ownership permissions.
More information about the Collab-qa-commits
mailing list