From 9d18a07b3cdd208404885f378891f73884de2053 Mon Sep 17 00:00:00 2001
From: Joachim Breitner <mail@joachim-breitner.de>
Date: Wed, 16 Apr 2014 17:14:06 +0200
Subject: name it schroot-create

---
 bin/schroot-create.sh  | 115 +++++++++++++++++++++++++++++++++++++++++++++++++
 bin/schroot-install.sh | 115 -------------------------------------------------
 2 files changed, 115 insertions(+), 115 deletions(-)
 create mode 100755 bin/schroot-create.sh
 delete mode 100755 bin/schroot-install.sh

(limited to 'bin')

diff --git a/bin/schroot-create.sh b/bin/schroot-create.sh
new file mode 100755
index 00000000..181b3972
--- /dev/null
+++ b/bin/schroot-create.sh
@@ -0,0 +1,115 @@
+#!/bin/bash
+
+# Copyright 2012-2014 Holger Levsen <holger@layer-acht.org>
+# Copyright      2013 Antonio Terceiro <terceiro@debian.org>
+# released under the GPLv=2
+
+# $2 = schroot name
+# $1 = base distro
+# $2 $3 ... = extra packages to install
+
+# bootstraps a new chroot for schroot, and then moves it into the right location
+
+set -e
+export LC_ALL=C
+
+# Defaults for the jenkins.debian.net environment
+if [ -z "$MIRROR" ]; then
+	export MIRROR=http://ftp.de.debian.org/debian
+fi
+if [ -z "$http_proxy" ]; then
+	# export http_proxy="http://localhost:3128"
+	:
+fi
+if [ -z "$CHROOT_BASE" ]; then
+	export CHROOT_BASE=/chroots
+fi
+if [ -z "$SCHROOT_BASE" ]; then
+	export SCHROOT_BASE=/schroots
+fi
+
+if [ $# -lt 2 ]; then
+	echo "usage: $0 DISTRO [backports] CMD [ARG1 ARG2 ...]"
+	exit 1
+fi
+
+TARGET="$1"
+shift
+DISTRO="$1"
+shift
+
+if [ "$1" == "backports" ] ; then
+	BACKPORTS="deb $MIRROR ${DISTRO}-backports main"
+	BACKPORTSSRC="deb-src $MIRROR ${DISTRO}-backports main"
+	shift
+fi
+
+if [ ! -d "$CHROOT_BASE" ]; then
+	echo "Directory $CHROOT_BASE does not exist, aborting."
+	exit 1
+fi
+
+export CHROOT_TARGET=$(mktemp -d -p $CHROOT_BASE/ schroot-install-$TARGET-XXXX)
+if [ -z "$CHROOT_TARGET" ]; then
+	echo "Could not create a directory to create the chroot in, aborting."
+	exit 1
+fi
+
+export CURDIR=$(pwd)
+
+bootstrap() {
+	sudo debootstrap $DISTRO $CHROOT_TARGET $MIRROR
+
+	sudo -s <<-EOF
+		set -e
+		set -x
+		echo -e '#!/bin/sh\nexit 101' > $CHROOT_TARGET/usr/sbin/policy-rc.d
+		chmod +x $CHROOT_TARGET/usr/sbin/policy-rc.d
+		echo 'Acquire::http::Proxy "$http_proxy";' > $CHROOT_TARGET/etc/apt/apt.conf.d/80proxy
+		echo "deb-src $MIRROR $DISTRO main" >> $CHROOT_TARGET/etc/apt/sources.list
+		echo "${BACKPORTS}" >> $CHROOT_TARGET/etc/apt/sources.list
+		echo "${BACKPORTSSRC}" >> $CHROOT_TARGET/etc/apt/sources.list
+		EOF
+}
+
+cleanup() {
+	if [ -d $CHROOT_TARGET ]; then
+		sudo rm -rf --one-file-system $CHROOT_TARGET || fuser -mv $CHROOT_TARGET
+	fi
+}
+trap cleanup INT TERM EXIT
+bootstrap
+
+trap - INT TERM EXIT
+
+# pivot the new schroot in place
+rand=$RANDOM
+if [ -d $SCHROOT_BASE/"$TARGET" ]
+then
+	sudo mv $SCHROOT_BASE/"$TARGET" $SCHROOT_BASE/"$TARGET"-"$rand"
+fi
+
+sudo mv $CHROOT_TARGET $SCHROOT_BASE/"$TARGET"
+
+if [ -d $SCHROOT_BASE/"$TARGET"-"$rand" ]
+then
+	sudo rm -rf --one-file-system $SCHROOT_BASE/"$TARGET"-"$rand"
+fi
+
+# write the schroot config
+echo "Writing configuration"
+sudo tee /etc/schroot/chroot.d/jenkins-"$TARGET" <<-__END__
+	[jenkins-$TARGET]
+	description=Jenkins schroot $TARGET
+	directory=$SCHROOT_BASE/$TARGET
+	type=directory
+	root-users=jenkins
+	source-root-users=jenkins
+	union-type=aufs
+	__END__
+
+schroot -c "source:jenkins-$TARGET" -u root -- apt-get update
+if [ -n "$1" ]
+then
+	schroot -c "source:jenkins-$TARGET" -u root -- apt-get install -y --no-install-recommends "$@"
+fi
diff --git a/bin/schroot-install.sh b/bin/schroot-install.sh
deleted file mode 100755
index 181b3972..00000000
--- a/bin/schroot-install.sh
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/bin/bash
-
-# Copyright 2012-2014 Holger Levsen <holger@layer-acht.org>
-# Copyright      2013 Antonio Terceiro <terceiro@debian.org>
-# released under the GPLv=2
-
-# $2 = schroot name
-# $1 = base distro
-# $2 $3 ... = extra packages to install
-
-# bootstraps a new chroot for schroot, and then moves it into the right location
-
-set -e
-export LC_ALL=C
-
-# Defaults for the jenkins.debian.net environment
-if [ -z "$MIRROR" ]; then
-	export MIRROR=http://ftp.de.debian.org/debian
-fi
-if [ -z "$http_proxy" ]; then
-	# export http_proxy="http://localhost:3128"
-	:
-fi
-if [ -z "$CHROOT_BASE" ]; then
-	export CHROOT_BASE=/chroots
-fi
-if [ -z "$SCHROOT_BASE" ]; then
-	export SCHROOT_BASE=/schroots
-fi
-
-if [ $# -lt 2 ]; then
-	echo "usage: $0 DISTRO [backports] CMD [ARG1 ARG2 ...]"
-	exit 1
-fi
-
-TARGET="$1"
-shift
-DISTRO="$1"
-shift
-
-if [ "$1" == "backports" ] ; then
-	BACKPORTS="deb $MIRROR ${DISTRO}-backports main"
-	BACKPORTSSRC="deb-src $MIRROR ${DISTRO}-backports main"
-	shift
-fi
-
-if [ ! -d "$CHROOT_BASE" ]; then
-	echo "Directory $CHROOT_BASE does not exist, aborting."
-	exit 1
-fi
-
-export CHROOT_TARGET=$(mktemp -d -p $CHROOT_BASE/ schroot-install-$TARGET-XXXX)
-if [ -z "$CHROOT_TARGET" ]; then
-	echo "Could not create a directory to create the chroot in, aborting."
-	exit 1
-fi
-
-export CURDIR=$(pwd)
-
-bootstrap() {
-	sudo debootstrap $DISTRO $CHROOT_TARGET $MIRROR
-
-	sudo -s <<-EOF
-		set -e
-		set -x
-		echo -e '#!/bin/sh\nexit 101' > $CHROOT_TARGET/usr/sbin/policy-rc.d
-		chmod +x $CHROOT_TARGET/usr/sbin/policy-rc.d
-		echo 'Acquire::http::Proxy "$http_proxy";' > $CHROOT_TARGET/etc/apt/apt.conf.d/80proxy
-		echo "deb-src $MIRROR $DISTRO main" >> $CHROOT_TARGET/etc/apt/sources.list
-		echo "${BACKPORTS}" >> $CHROOT_TARGET/etc/apt/sources.list
-		echo "${BACKPORTSSRC}" >> $CHROOT_TARGET/etc/apt/sources.list
-		EOF
-}
-
-cleanup() {
-	if [ -d $CHROOT_TARGET ]; then
-		sudo rm -rf --one-file-system $CHROOT_TARGET || fuser -mv $CHROOT_TARGET
-	fi
-}
-trap cleanup INT TERM EXIT
-bootstrap
-
-trap - INT TERM EXIT
-
-# pivot the new schroot in place
-rand=$RANDOM
-if [ -d $SCHROOT_BASE/"$TARGET" ]
-then
-	sudo mv $SCHROOT_BASE/"$TARGET" $SCHROOT_BASE/"$TARGET"-"$rand"
-fi
-
-sudo mv $CHROOT_TARGET $SCHROOT_BASE/"$TARGET"
-
-if [ -d $SCHROOT_BASE/"$TARGET"-"$rand" ]
-then
-	sudo rm -rf --one-file-system $SCHROOT_BASE/"$TARGET"-"$rand"
-fi
-
-# write the schroot config
-echo "Writing configuration"
-sudo tee /etc/schroot/chroot.d/jenkins-"$TARGET" <<-__END__
-	[jenkins-$TARGET]
-	description=Jenkins schroot $TARGET
-	directory=$SCHROOT_BASE/$TARGET
-	type=directory
-	root-users=jenkins
-	source-root-users=jenkins
-	union-type=aufs
-	__END__
-
-schroot -c "source:jenkins-$TARGET" -u root -- apt-get update
-if [ -n "$1" ]
-then
-	schroot -c "source:jenkins-$TARGET" -u root -- apt-get install -y --no-install-recommends "$@"
-fi
-- 
cgit v1.2.3-70-g09d2