From a27bad611bfd95ef3e79e0a71289bac32cab6dda Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Mon, 2 Mar 2015 01:43:27 +0100 Subject: s#distro#suite#g --- bin/schroot-create.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/bin/schroot-create.sh b/bin/schroot-create.sh index 5448807a..a2a337eb 100755 --- a/bin/schroot-create.sh +++ b/bin/schroot-create.sh @@ -12,28 +12,28 @@ common_init "$@" # bootstraps a new chroot for schroot, and then moves it into the right location # $1 = schroot name -# $2 = base distro +# $2 = base 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 [ "$DISTRO" = "experimental" ] ; then +if [ "$SUITE" = "experimental" ] ; then # experimental cannot be bootstrapped - DISTRO=sid + SUITE=sid EXTRA_PACKAGES="deb $MIRROR experimental main" EXTRA_SOURCES="deb-src $MIRROR experimental main" fi if [ "$1" = "backports" ] ; then - EXTRA_PACKAGES="deb $MIRROR ${DISTRO}-backports main" - EXTRA_SOURCES="deb-src $MIRROR ${DISTRO}-backports main" + EXTRA_PACKAGES="deb $MIRROR ${SUITE}-backports main" + EXTRA_SOURCES="deb-src $MIRROR ${SUITE}-backports main" shift elif [ "$1" = "reproducible" ] ; then EXTRA_PACKAGES="deb http://reproducible.alioth.debian.org/debian/ ./" @@ -92,13 +92,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 echo "${EXTRA_PACKAGES}" | sudo tee -a $CHROOT_TARGET/etc/apt/sources.list >/dev/null echo "${EXTRA_SOURCES}" | sudo tee -a $CHROOT_TARGET/etc/apt/sources.list >/dev/null -- cgit v1.2.3-70-g09d2