27c27
< # $FreeBSD: head/usr.sbin/bsdconfig/share/media/http.subr 257788 2013-11-07 10:40:19Z dteske $
---
> # $FreeBSD: head/usr.sbin/bsdconfig/share/media/http.subr 257795 2013-11-07 12:40:42Z dteske $
80c80,81
< '$msg_main_site' 'ftp.freebsd.org'
---
> 'dist $msg_main_site' 'ftp.freebsd.org'
> 'pkg $msg_main_site' 'pkg.freebsd.org'
324c325
< device_http set shutdown :
---
> device_http set shutdown f_media_shutdown_http
454a456,460
> if [ "$HTTP_INITIALIZED" ]; then
> f_dprintf "HTTP device already initialized."
> return $SUCCESS
> fi
>
496,502c502,514
< for fdir in $HTTP_DIRS; do
< setvar $VAR_HTTP_PATH "$hp/$fdir/$rel"
< if f_http_check_access; then
< http_found=$SUCCESS
< break
< fi
< done
---
> setvar $VAR_HTTP_PATH \
> "$hp/freebsd:${UNAME_R%%.*}:$UNAME_PKG/latest"
> if f_http_check_access; then
> http_found=$SUCCESS
> else
> for fdir in $HTTP_DIRS; do
> setvar $VAR_HTTP_PATH "$hp/$fdir/$rel"
> if f_http_check_access; then
> http_found=$SUCCESS
> break
> fi
> done
> fi
505c517,520
< [ $http_found -eq $SUCCESS ] && break
---
> if [ $http_found -eq $SUCCESS ]; then
> HTTP_INITIALIZED=YES
> break
> fi
511c526
< unset $VAR_HTTP_PATH
---
> unset HTTP_INITIALIZED $VAR_HTTP_PATH
560a576,580
> if [ ! "$HTTP_INITIALIZED" ]; then
> f_dprintf "No HTTP connection open, can't get file %s" "$file"
> return $FAILURE
> fi
>
653a674,685
> # f_media_shutdown_http $device
> #
> # Shuts down the HTTP device. Return status should be ignored. Note that since
> # we don't maintain an open connection to the HTTP server, nothing to do.
> #
> f_media_shutdown_http()
> {
> [ "$HTTP_INITIALIZED" ] || return $SUCCESS
>
> unset HTTP_INITIALIZED
> }
>