aboutsummaryrefslogtreecommitdiff
path: root/release/release.sh
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2013-11-18 16:04:04 +0000
committerGlen Barber <gjb@FreeBSD.org>2013-11-18 16:04:04 +0000
commit98e83c53affcbc2962f9ae384c5c6b208b0e3dae (patch)
treea3f0663af4131f08fa579412409d09279cb3b420 /release/release.sh
parent042a51f641253b1e9e93badf3c0ca773d2ba4a14 (diff)
downloadsrc-98e83c53affcbc2962f9ae384c5c6b208b0e3dae.tar.gz
src-98e83c53affcbc2962f9ae384c5c6b208b0e3dae.zip
Unconditionally copy the build host /etc/resolv.conf into
the chroot directory, since hostname resolution may be needed in the case of building a dvd image (with packages) and also setting 'NOPORTS=1'. MFC after: 3 days X-MFC-With: r258305, r258307 Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/head/; revision=258308
Diffstat (limited to 'release/release.sh')
-rwxr-xr-xrelease/release.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/release/release.sh b/release/release.sh
index 7ac18a952857..364415058e2e 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -159,6 +159,7 @@ if [ "x${NOPORTS}" = "x" ]; then
svn co ${SVNROOT}/${PORTBRANCH} ${CHROOTDIR}/usr/ports
fi
+cp /etc/resolv.conf ${CHROOTDIR}/etc/resolv.conf
cd ${CHROOTDIR}/usr/src
make ${CHROOT_WMAKEFLAGS} buildworld
make ${CHROOT_IMAKEFLAGS} installworld DESTDIR=${CHROOTDIR}
@@ -193,7 +194,6 @@ if [ -e ${SRC_CONF} ] && [ ! -c ${SRC_CONF} ]; then
fi
if [ -d ${CHROOTDIR}/usr/ports ]; then
- cp /etc/resolv.conf ${CHROOTDIR}/etc/resolv.conf
build_doc_ports ${CHROOTDIR}
fi