--- 20-metadata-basesystem.sh.org 2008-02-22 15:57:55 +0200 +++ 20-metadata-basesystem.sh 2008-02-29 21:18:47 +0200 @@ -5,14 +5,23 @@ METHOD="${METHOD:-cdrom}" HOST="${HOST:-}" PREFIX="${PREFIX:-}" +LOGIN="${LOGIN:-}" +PASSWORD="${PASSWORD:-}" +if [ -n "$PASSWORD" ]; then + PASSWORD=$(echo ":$PASSWORD") +fi + [ "$PREFIX" != "/" ] || PREFIX= image_prefix= case "$METHOD" in - http|ftp) + http) image_prefix="$METHOD://$HOST$PREFIX" ;; + ftp) + image_prefix="$METHOD://$LOGIN$PASSWORD@$HOST$PREFIX" + ;; cdrom|disk|nfs) image_prefix="$image_dir" ;;