From ab34115b42cbcb42cb91593601d6daff2c7f32ad Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Sun, 28 Apr 2013 13:37:52 -0600 Subject: [PATCH] Use default mirror from debootstrap when not explicitly provided, and add better target directory naming --- contrib/mkimage-debian.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/mkimage-debian.sh b/contrib/mkimage-debian.sh index dcc8e08480..ace555ada6 100755 --- a/contrib/mkimage-debian.sh +++ b/contrib/mkimage-debian.sh @@ -14,7 +14,7 @@ include='iproute,iputils-ping' repo="$1" suite="${2:-$latestSuite}" -mirror="${3:-http://ftp.us.debian.org/debian}" +mirror="${3:-}" # stick to the default debootstrap mirror if one is not provided if [ ! "$repo" ]; then echo >&2 "usage: $0 repo [suite [mirror]]" @@ -22,7 +22,7 @@ if [ ! "$repo" ]; then exit 1 fi -target="/tmp/docker-rootfs-$$-$RANDOM-debian-$suite" +target="/tmp/docker-rootfs-debian-$suite-$$-$RANDOM" cd "$(dirname "$(readlink -f "$BASH_SOURCE")")" returnTo="$(pwd -P)"