Date: Sun, 3 Oct 2004 23:05:57 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 62612 for review Message-ID: <200410032305.i93N5v3A013100@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=62612 Change 62612 by peter@peter_overcee on 2004/10/03 23:05:11 unwind some of the useless bind chroot crud. Affected files ... .. //depot/projects/hammer/etc/Makefile#30 edit .. //depot/projects/hammer/etc/mtree/BIND.etc.dist#1 add .. //depot/projects/hammer/etc/mtree/BIND.var.dist#1 add Differences ... ==== //depot/projects/hammer/etc/Makefile#30 (text+ko) ==== @@ -123,9 +123,14 @@ cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${MTREE} ${DESTDIR}/etc/mtree .if !defined(NO_BIND_ETC) && !defined(NO_BIND) +.if defined(NO_BIND_CHROOT) + cd ${.CURDIR}/namedb; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ + ${NAMEDB} ${DESTDIR}/etc/namedb +.else cd ${.CURDIR}/namedb; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${NAMEDB} ${DESTDIR}/var/named/etc/namedb .endif +.endif cd ${.CURDIR}/ppp; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \ ${PPPCNF} ${DESTDIR}/etc/ppp cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ @@ -184,10 +189,17 @@ mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.include.dist \ -p ${DESTDIR}/usr/include .endif +.if defined(NO_BIND_CHROOT) + mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.etc.dist \ + -p ${DESTDIR}/etc + mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.var.dist \ + -p ${DESTDIR}/var +.else mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.chroot.dist \ -p ${DESTDIR}/var/named ln -fhs ${DESTDIR}/var/named/etc/namedb ${DESTDIR}/etc/namedb .endif +.endif .if !defined(NO_SENDMAIL) mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.sendmail.dist -p ${DESTDIR}/ .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200410032305.i93N5v3A013100>