X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver-build.debootstrap;h=e4776438601c21d8647408f58dcb89581cdbdbae;hb=552047c69c293485ce2401ae8bc0c0894b2fb410;hp=4e36d251a4801e02768b86da12d3478c7edf575e;hpb=c53cd37f715c52fbb47cbd7f6d0d9200b20ce861;p=util-vserver.git diff --git a/util-vserver/scripts/vserver-build.debootstrap b/util-vserver/scripts/vserver-build.debootstrap index 4e36d25..e477643 100644 --- a/util-vserver/scripts/vserver-build.debootstrap +++ b/util-vserver/scripts/vserver-build.debootstrap @@ -54,11 +54,11 @@ function findDebootstrap workdir=$dir dst=$dir/debootstrap.deb - findFile DEBOOTSTRAP_URI "$CONFDIR"/.defaults/debootstrap.uri "$PKGLIBDEFAULTDIR"/debootstrap.uri + findFile DEBOOTSTRAP_URI "$CONFDIR"/.defaults/apps/debootstrap/uri "$PKGLIBDEFAULTDIR"/debootstrap.uri read tmp <$DEBOOTSTRAP_URI case "$tmp" in (/*) ln -s "$tmp" "$dst";; - (http://*|ftp://*) $_WGET -q -O "$dst" "$tmp";; + (http://*|ftp://*) $_WGET -nv -O "$dst" "$tmp";; (*) echo $"Unsupported URI scheme '$tmp'" >&2 exit 1;; esac @@ -88,7 +88,7 @@ while true; do -m) mirror=$2; shift;; --debug) set -x;; --) shift; break ;; - *) echo "vserver-build.skeleton: internal error: unrecognized option '$1'" + *) echo "vserver-build.skeleton: internal error: unrecognized option '$1'" >&2 exit 1 ;; esac