Date: Wed, 15 Nov 2017 19:14:44 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325863 - head/release Message-ID: <201711151914.vAFJEjZx019741@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Wed Nov 15 19:14:44 2017 New Revision: 325863 URL: https://svnweb.freebsd.org/changeset/base/325863 Log: Only copy /etc/resolv.conf to ${CHROOTDIR} if /etc/resolv.conf does not already exist within ${CHROOTDIR}. This allows re-using a build chroot with CHROOTBUILD_SKIP set to a non-empty value and CHROOTDIR set to '/' in release.conf. MFC after: 3 days Sponsored by: The FreeBSD Foundation Modified: head/release/release.sh Modified: head/release/release.sh ============================================================================== --- head/release/release.sh Wed Nov 15 19:04:23 2017 (r325862) +++ head/release/release.sh Wed Nov 15 19:14:44 2017 (r325863) @@ -252,8 +252,8 @@ chroot_setup() { extra_chroot_setup() { mkdir -p ${CHROOTDIR}/dev mount -t devfs devfs ${CHROOTDIR}/dev - [ -e /etc/resolv.conf ] && cp /etc/resolv.conf \ - ${CHROOTDIR}/etc/resolv.conf + [ -e /etc/resolv.conf -a ! -e ${CHROOTDIR}/etc/resolv.conf ] && \ + cp /etc/resolv.conf ${CHROOTDIR}/etc/resolv.conf # Run ldconfig(8) in the chroot directory so /var/run/ld-elf*.so.hints # is created. This is needed by ports-mgmt/pkg. eval chroot ${CHROOTDIR} /etc/rc.d/ldconfig forcerestart
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711151914.vAFJEjZx019741>