From ac111b3fdbd19ebc47024332ff22073869a9d632 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Fri, 27 Feb 2015 14:41:37 +0100 Subject: reproducible: use SUITE consistently --- bin/reproducible_setup_schroot.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'bin') diff --git a/bin/reproducible_setup_schroot.sh b/bin/reproducible_setup_schroot.sh index d8772112..f02c7c80 100755 --- a/bin/reproducible_setup_schroot.sh +++ b/bin/reproducible_setup_schroot.sh @@ -15,16 +15,16 @@ common_init "$@" # bootstraps a new chroot for schroot, and then moves it into the right location # $1 = schroot name -# $2 = base distro +# $2 = base distro/suite # $3 $4 ... = extra packages to install if [ $# -lt 2 ]; then - echo "usage: $0 TARGET DISTRO [backports] CMD [ARG1 ARG2 ...]" + echo "usage: $0 TARGET SUITE [backports] CMD [ARG1 ARG2 ...]" exit 1 fi TARGET="$1" shift -DISTRO="$1" +SUITE="$1" shift if [ ! -d "$CHROOT_BASE" ]; then @@ -42,13 +42,13 @@ bootstrap() { mkdir -p "$CHROOT_TARGET/etc/dpkg/dpkg.cfg.d" echo force-unsafe-io > "$CHROOT_TARGET/etc/dpkg/dpkg.cfg.d/02dpkg-unsafe-io" - echo "Bootstraping $DISTRO into $CHROOT_TARGET now." - sudo debootstrap $DISTRO $CHROOT_TARGET $MIRROR + echo "Bootstraping $SUITE into $CHROOT_TARGET now." + sudo debootstrap $SUITE $CHROOT_TARGET $MIRROR echo -e '#!/bin/sh\nexit 101' | sudo tee $CHROOT_TARGET/usr/sbin/policy-rc.d >/dev/null sudo chmod +x $CHROOT_TARGET/usr/sbin/policy-rc.d echo "Acquire::http::Proxy \"$http_proxy\";" | sudo tee $CHROOT_TARGET/etc/apt/apt.conf.d/80proxy >/dev/null - echo "deb-src $MIRROR $DISTRO main" | sudo tee -a $CHROOT_TARGET/etc/apt/sources.list > /dev/null + echo "deb-src $MIRROR $SUITE main" | sudo tee -a $CHROOT_TARGET/etc/apt/sources.list > /dev/null sudo chroot $CHROOT_TARGET apt-get update if [ -n "$1" ] ; then -- cgit v1.2.3-70-g09d2