diff options
| author | jmmv <jmmv@FreeBSD.org> | 2013-12-25 13:57:23 +0000 |
|---|---|---|
| committer | jmmv <jmmv@FreeBSD.org> | 2013-12-25 13:57:23 +0000 |
| commit | b8dac04a8fa459169772f5a275961c42b264ca01 (patch) | |
| tree | b207a244d79a0f54356187916047143ee4005e67 /release/release.sh | |
| parent | 7e0351c07263070db15e9199ff727ae3f53daab5 (diff) | |
| download | FreeBSD-src-b8dac04a8fa459169772f5a275961c42b264ca01.zip FreeBSD-src-b8dac04a8fa459169772f5a275961c42b264ca01.tar.gz | |
Delay copying of resolv.conf into the chroot until /etc exists.
With an unpopulated chroot dir, release building was failing because
the script was attempting to copy resolv.conf into a non-existent /etc
directory of the chroot. Fix this by copying the file only after the
installworld has happened, which will create this directory.
Reviewed by: gjb
Approved by: rpaulo (mentor)
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 1389ce3..4176520 100755 --- a/release/release.sh +++ b/release/release.sh @@ -162,12 +162,12 @@ 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} make ${CHROOT_DMAKEFLAGS} distribution DESTDIR=${CHROOTDIR} mount -t devfs devfs ${CHROOTDIR}/dev +cp /etc/resolv.conf ${CHROOTDIR}/etc/resolv.conf trap "umount ${CHROOTDIR}/dev" EXIT # Clean up devfs mount on exit build_doc_ports() { |
