diff options
| -rw-r--r-- | usr.sbin/bsdinstall/FreeBSD-base.conf.in | 2 | ||||
| -rw-r--r-- | usr.sbin/bsdinstall/Makefile | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/usr.sbin/bsdinstall/FreeBSD-base.conf.in b/usr.sbin/bsdinstall/FreeBSD-base.conf.in index 86ec8fabe253..13c94bbb8a64 100644 --- a/usr.sbin/bsdinstall/FreeBSD-base.conf.in +++ b/usr.sbin/bsdinstall/FreeBSD-base.conf.in @@ -1,5 +1,5 @@ FreeBSD-base: { - url: "pkg+https://%%PKGHOST%%.FreeBSD.org/${ABI}/%%SUBURL%%", + url: "pkg+https://pkg.FreeBSD.org/${ABI}/%%SUBURL%%", mirror_type: "srv", signature_type: "fingerprints", fingerprints: "/usr/share/keys/%%KEYSDIR%%", diff --git a/usr.sbin/bsdinstall/Makefile b/usr.sbin/bsdinstall/Makefile index a576f2d0794e..f796a8710c5b 100644 --- a/usr.sbin/bsdinstall/Makefile +++ b/usr.sbin/bsdinstall/Makefile @@ -21,26 +21,22 @@ _REVISION!= ${MAKE} -C ${SRCTOP}/release -V REVISION REVISION?= ${_REVISION} .if ${BRANCH} == CURRENT || ${BRANCH} == STABLE -PKGHOST= pkg KEYSDIR= pkg SUBURL= base_latest .elif ${BRANCH} == RELEASE -PKGHOST= pkgbase KEYSDIR= pkgbase-${REVISION:C/\.[0-9]+//} SUBURL= base_release_${REVISION:C/[0-9]+\.//} .elif ${BRANCH:C/[0-9]+$//} == BETA || \ ${BRANCH:C/[0-9]+$//} == RC -PKGHOST= pkgbase KEYSDIR= pkgbase-${REVISION:C/\.[0-9]+//} SUBURL= base_release_${REVISION:C/[0-9]+\.//}_${BRANCH:tl} .else .warning Invalid branch "${BRANCH}" -PKGHOST= pkg KEYSDIR= pkg SUBURL= base_latest .endif FreeBSD-base.conf: FreeBSD-base.conf.in - sed "s|%%PKGHOST%%|${PKGHOST}|;s|%%SUBURL%%|${SUBURL}|;s|%%KEYSDIR%%|${KEYSDIR}|" < ${.ALLSRC} > ${.TARGET} + sed "s|%%SUBURL%%|${SUBURL}|;s|%%KEYSDIR%%|${KEYSDIR}|" < ${.ALLSRC} > ${.TARGET} .include <bsd.prog.mk> |