nrelease: Allow to build snapshots on tmpfs

Operating Systems / DragonFlyBSD - zrj [gmail.com] - 10 March 2016 09:02 EST

/usr/libexec/locate.updatedb excludes files residing on tmpfs. That causes an empty locate db failure just before the end of customizeiso target and leaves a dangling ${ISOROOT}/dev mount.

By permitting updatedb to fail, the requirement for ISOROOT to be on ufs/hammer fs is lifted.

###

diff --git a/nrelease/Makefile b/nrelease/Makefile
index 0105bb5..d0329a8 100644
--- a/nrelease/Makefile
+++ b/nrelease/Makefile
@@ -313,9 +313,10 @@ customizeiso:
rm -f ${ISOROOT}/etc/resolv.conf
.endif
#
- # Finally, update the locate(8) database
+ # Finally, update the locate(8) database, allow ISODIR
+ # to be on tmpfs (fails to create locate database then)
#
- ${CHROOT_CMD} /etc/periodic/weekly/310.locate
+ -${CHROOT_CMD} /etc/periodic/weekly/310.locate
umount ${ISOROOT}/dev
#
# Recopy files that dports may have updated in /etc into /etc.hdd

b34d3b9 nrelease: Allow to build snapshots on tmpfs.
nrelease/Makefile | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

Upstream: gitweb.dragonflybsd.org


  • Share