diff options
| author | gjb <gjb@FreeBSD.org> | 2013-11-18 16:04:04 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2013-11-18 16:04:04 +0000 |
| commit | 5c3fff5c5fbeddf1731015a5ca230a9743e40252 (patch) | |
| tree | a3f0663af4131f08fa579412409d09279cb3b420 /release/release.sh | |
| parent | fa17320479f224f90543d349a4996a7c0ee5f573 (diff) | |
| download | FreeBSD-src-5c3fff5c5fbeddf1731015a5ca230a9743e40252.zip FreeBSD-src-5c3fff5c5fbeddf1731015a5ca230a9743e40252.tar.gz | |
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
Diffstat (limited to 'release/release.sh')
| -rwxr-xr-x | release/release.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/release/release.sh b/release/release.sh index 7ac18a9..3644150 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 |
