diff options
| author | Holger Levsen <holger@layer-acht.org> | 2012-12-09 16:22:45 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2012-12-09 16:36:02 +0100 |
| commit | 72c06c9e9657370cf6d940777ad3840745e97d1f (patch) | |
| tree | 85e7cf69eea1f067a1e3592fd4408c2036fa3801 /bin | |
| parent | 3319dfe610b5d50c31fc62492896fb1b3dc4ffba (diff) | |
| download | jenkins.debian.net-72c06c9e9657370cf6d940777ad3840745e97d1f.tar.xz | |
rename chroot-test to chroot-installation and small improvements
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/chroot-installation.sh (renamed from bin/chroot_tester.sh) | 6 | ||||
| -rwxr-xr-x | bin/housekeeping.sh | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bin/chroot_tester.sh b/bin/chroot-installation.sh index cf27f393..4d1e8f30 100755 --- a/bin/chroot_tester.sh +++ b/bin/chroot-installation.sh @@ -35,7 +35,7 @@ export DEBIAN_FRONTEND=noninteractive export LC_ALL=C export http_proxy=$http_proxy" -export CHROOT_TARGET=$(mktemp -d -p /chroots/ chroot-tests-$1.XXXXXXXXX) +export CHROOT_TARGET=$(mktemp -d -p /chroots/ chroot-installation-$1.XXXXXXXXX) export TMPFILE=$(mktemp -u) export CTMPFILE=$CHROOT_TARGET/$TMPFILE @@ -77,6 +77,7 @@ EOF prepare_install_build_depends() { cat >> $CTMPFILE <<-EOF $SCRIPT_HEADER +apt-get -y install build-essential apt-get -y build-dep $@ EOF } @@ -152,8 +153,7 @@ if [ "$2" != "" ] ; then ;; full_desktop) install_packages full_desktop $FULL_DESKTOP ;; - developer) install_packages developer $FULL_DESKTOP - install_build_depends developer $FULL_DESKTOP + developer) install_build_depends developer $FULL_DESKTOP ;; *) echo "unsupported component." exit 1 diff --git a/bin/housekeeping.sh b/bin/housekeeping.sh index c146b60d..b1c862c1 100755 --- a/bin/housekeeping.sh +++ b/bin/housekeeping.sh @@ -24,7 +24,7 @@ echo vnstat -CHROOT_PATTERN="/chroots/chroot-tests-*" +CHROOT_PATTERN="/chroots/chroot-installation-*" HOUSE=$(ls $CHROOT_PATTERN 2>/dev/null) if [ "$HOUSE" != "" ] ; then figlet "Warning:" |