diff options
| author | dteske <dteske@FreeBSD.org> | 2013-06-23 10:48:26 +0000 |
|---|---|---|
| committer | dteske <dteske@FreeBSD.org> | 2013-06-23 10:48:26 +0000 |
| commit | f6abdf341e4dca12a6466ea1023398cb1a7c9f47 (patch) | |
| tree | fd70cb8d92062a19aa0eaa2ae4872209ec1b7279 /usr.sbin/bsdconfig/share/media/Makefile | |
| parent | 0af114bd22d3e848242f61b97b1be058e191e691 (diff) | |
| download | FreeBSD-src-f6abdf341e4dca12a6466ea1023398cb1a7c9f47.zip FreeBSD-src-f6abdf341e4dca12a6466ea1023398cb1a7c9f47.tar.gz | |
Merge r248313 from stable/9 sysinstall(8) to head bsdconfig(8):
Add support for installation directly via HTTP.
While we're here, remove the menu-item for Passive FTP (since moving to
ftp(1) and switching FTPMODE to `auto' by default -- see r251613 -- the
single remaining FTP menu-item works for both ftp.f.o and ftp-archive.f.o;
previously each requiring separately active versus passive both work with
the `auto' setting). In scripting you still have mediaSetFTPActive and
mediaSetFTPPassive but the remaining FTP menu-item uses mediaSetFTP which
defaults to `auto' (aforementioned SVN r251613).
Diffstat (limited to 'usr.sbin/bsdconfig/share/media/Makefile')
| -rw-r--r-- | usr.sbin/bsdconfig/share/media/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/bsdconfig/share/media/Makefile b/usr.sbin/bsdconfig/share/media/Makefile index ebd7c96..6436749 100644 --- a/usr.sbin/bsdconfig/share/media/Makefile +++ b/usr.sbin/bsdconfig/share/media/Makefile @@ -4,8 +4,8 @@ NO_OBJ= FILESDIR= ${SHAREDIR}/bsdconfig/media FILES= any.subr cdrom.subr common.subr directory.subr dos.subr \ - floppy.subr ftp.subr httpproxy.subr network.subr nfs.subr \ - options.subr tcpip.subr ufs.subr usb.subr + floppy.subr ftp.subr http.subr httpproxy.subr network.subr \ + nfs.subr options.subr tcpip.subr ufs.subr usb.subr beforeinstall: mkdir -p ${DESTDIR}${FILESDIR} |
