From owner-cvs-all@FreeBSD.ORG Tue Oct 5 23:57:32 2004 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3A07A16A4CE; Tue, 5 Oct 2004 23:57:32 +0000 (GMT) Received: from rwcrmhc13.comcast.net (rwcrmhc13.comcast.net [204.127.198.39]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1B45543D1D; Tue, 5 Oct 2004 23:57:32 +0000 (GMT) (envelope-from DougB@freebsd.org) Received: from ob.icann.org ([192.0.35.106]) by comcast.net (rwcrmhc13) with SMTP id <20041005235730015002s6goe> (Authid: domain_name_tsar); Tue, 5 Oct 2004 23:57:31 +0000 Date: Tue, 5 Oct 2004 16:57:15 -0700 (PDT) From: Doug Barton To: Brian Somers In-Reply-To: <20041005230204.5401f0be@dev.lan.Awfulhak.org> Message-ID: <20041005164914.U3095@bo.vpnaa.bet> References: <200410051303.i95D38Nl047864@repoman.freebsd.org> <20041005172056.GA4568@ip.net.ua> <20041005230204.5401f0be@dev.lan.Awfulhak.org> Organization: http://www.FreeBSD.org/ X-message-flag: Outlook -- Not just for spreading viruses anymore! MIME-Version: 1.0 Content-Type: MULTIPART/MIXED; BOUNDARY="0-1187536900-1097020635=:3095" cc: cvs-src@freebsd.org cc: src-committers@freebsd.org cc: Ruslan Ermilov cc: re@freebsd.org cc: cvs-all@freebsd.org Subject: Re: cvs commit: src/etc Makefile X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Oct 2004 23:57:32 -0000 This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --0-1187536900-1097020635=:3095 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed On Tue, 5 Oct 2004, Brian Somers wrote: > On Tue, 5 Oct 2004 20:20:56 +0300, Ruslan Ermilov wrote: >>> Shouldn't this be: >>> >>> ln -fhs ../var/named/etc/namedb ${DESTDIR}/etc/namedb >>> >> No. > > If I mount an alternate filesystem hierarchy somewhere, isn't it a bit > useless/dangerous for symlinks to point outside of it? The attached patch combines the best of the various ideas that have been disucssed on this topic. 1. Incorporates Ruslan's improvements to where things are done related to the symlink in src/etc/Makefile. 2. Incorporates Brian's suggestion to make the link relative. This is the best way I can see to make it work as expected in all cases, including complete alternate filesystems. It should also solve the release engineering problem. 3. Add a new knob, NO_BIND_MTREE, as suggested by the folks who already have stuff in /var/named that they don't want me to mess with. :) 4. Updates make.conf(5) with the new stuff, and corrects a few paths that have changed since I last updated it. If everyone finds this acceptable, I will commit it, and then ask re@ for permission to MFC it, hopefully before 5-RC1. Thanks to everyone who contributed to this train of thought. Doug -- This .signature sanitized for your protection --0-1187536900-1097020635=:3095 Content-Type: TEXT/PLAIN; charset=US-ASCII; name="bind9-mtree-fix.diff" Content-Transfer-Encoding: BASE64 Content-ID: <20041005165715.S3095@bo.vpnaa.bet> Content-Description: Content-Disposition: attachment; filename="bind9-mtree-fix.diff" SW5kZXg6IGV0Yy9NYWtlZmlsZQ0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0K UkNTIGZpbGU6IC91c3IvbG9jYWwvbmN2cy9zcmMvZXRjL01ha2VmaWxlLHYN CnJldHJpZXZpbmcgcmV2aXNpb24gMS4zMzQNCmRpZmYgLXUgLXIxLjMzNCBN YWtlZmlsZQ0KLS0tIGV0Yy9NYWtlZmlsZQk1IE9jdCAyMDA0IDEzOjAzOjA4 IC0wMDAwCTEuMzM0DQorKysgZXRjL01ha2VmaWxlCTUgT2N0IDIwMDQgMjM6 NTQ6MDIgLTAwMDANCkBAIC0xMjIsMTAgKzEyMiwxOCBAQA0KIAkgICAgbG4g JHtERVNURElSfS9yb290Ly5wcm9maWxlICR7REVTVERJUn0vLnByb2ZpbGUN CiAJY2QgJHsuQ1VSRElSfS9tdHJlZTsgJHtJTlNUQUxMfSAtbyAke0JJTk9X Tn0gLWcgJHtCSU5HUlB9IC1tIDQ0NCBcDQogCSAgICAke01UUkVFfSAke0RF U1RESVJ9L2V0Yy9tdHJlZQ0KLS5pZiAhZGVmaW5lZChOT19CSU5EX0VUQykg JiYgIWRlZmluZWQoTk9fQklORCkNCisuaWYgIWRlZmluZWQoTk9fQklORCkN CisuaWYgIWRlZmluZWQoTk9fQklORF9FVEMpDQogCWNkICR7LkNVUkRJUn0v bmFtZWRiOyAke0lOU1RBTEx9IC1vICR7QklOT1dOfSAtZyAke0JJTkdSUH0g LW0gNjQ0IFwNCiAJICAgICR7TkFNRURCfSAke0RFU1RESVJ9L3Zhci9uYW1l ZC9ldGMvbmFtZWRiDQogLmVuZGlmDQorLmlmICFkZWZpbmVkKE5PX0JJTkRf TVRSRUUpDQorCUBpZiBbICEgLWUgJHtERVNURElSfS9ldGMvbmFtZWRiIF07 IHRoZW4gXA0KKwkJc2V0IC14OyBcDQorCQlsbiAtZmhzIC4uL3Zhci9uYW1l ZC9ldGMvbmFtZWRiICR7REVTVERJUn0vZXRjL25hbWVkYjsgXA0KKwlmaQ0K Ky5lbmRpZg0KKy5lbmRpZg0KIAljZCAkey5DVVJESVJ9L3BwcDsgJHtJTlNU QUxMfSAtbyAke0JJTk9XTn0gLWcgJHtCSU5HUlB9IC1tIDYwMCBcDQogCSAg ICAke1BQUENORn0gJHtERVNURElSfS9ldGMvcHBwDQogCWNkICR7LkNVUkRJ Un0vbWFpbDsgJHtJTlNUQUxMfSAtbyAke0JJTk9XTn0gLWcgJHtCSU5HUlB9 IC1tIDY0NCBcDQpAQCAtMTg0LDkgKzE5MiwxMCBAQA0KIAltdHJlZSAtZGVV ICR7TVRSRUVfRk9MTE9XU19TWU1MSU5LU30gLWYgJHsuQ1VSRElSfS9tdHJl ZS9CSU5ELmluY2x1ZGUuZGlzdCBcDQogCSAgICAtcCAke0RFU1RESVJ9L3Vz ci9pbmNsdWRlDQogLmVuZGlmDQorLmlmICFkZWZpbmVkKE5PX0JJTkRfTVRS RUUpDQogCW10cmVlIC1kZVUgJHtNVFJFRV9GT0xMT1dTX1NZTUxJTktTfSAt ZiAkey5DVVJESVJ9L210cmVlL0JJTkQuY2hyb290LmRpc3QgXA0KIAkgICAg LXAgJHtERVNURElSfS92YXIvbmFtZWQNCi0JbG4gLWZocyAvdmFyL25hbWVk L2V0Yy9uYW1lZGIgJHtERVNURElSfS9ldGMvbmFtZWRiDQorLmVuZGlmDQog LmVuZGlmDQogLmlmICFkZWZpbmVkKE5PX1NFTkRNQUlMKQ0KIAltdHJlZSAt ZGVVICR7TVRSRUVfRk9MTE9XU19TWU1MSU5LU30gLWYgJHsuQ1VSRElSfS9t dHJlZS9CU0Quc2VuZG1haWwuZGlzdCAtcCAke0RFU1RESVJ9Lw0KSW5kZXg6 IHNoYXJlL2V4YW1wbGVzL2V0Yy9tYWtlLmNvbmYNCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0NClJDUyBmaWxlOiAvdXNyL2xvY2FsL25jdnMvc3JjL3NoYXJl L2V4YW1wbGVzL2V0Yy9tYWtlLmNvbmYsdg0KcmV0cmlldmluZyByZXZpc2lv biAxLjIzNA0KZGlmZiAtdSAtcjEuMjM0IG1ha2UuY29uZg0KLS0tIHNoYXJl L2V4YW1wbGVzL2V0Yy9tYWtlLmNvbmYJMjcgU2VwIDIwMDQgMDg6MjM6NDIg LTAwMDAJMS4yMzQNCisrKyBzaGFyZS9leGFtcGxlcy9ldGMvbWFrZS5jb25m CTUgT2N0IDIwMDQgMjM6MzQ6NTggLTAwMDANCkBAIC0xNDksNiArMTQ5LDcg QEANCiAjTk9fQklORF9ETlNTRUM9CXRydWUJIyBEbyBub3QgYnVpbGQgZG5z c2VjLWtleWdlbiwgZG5zc2VjLXNpZ256b25lDQogI05PX0JJTkRfRVRDPQkJ dHJ1ZQkjIERvIG5vdCBpbnN0YWxsIGZpbGVzIHRvIC9ldGMvbmFtZWRiDQog I05PX0JJTkRfTElCU19MV1JFUz0JdHJ1ZQkjIERvIG5vdCBpbnN0YWxsIHRo ZSBsd3JlcyBsaWJyYXJ5DQorI05PX0JJTkRfTVRSRUU9CQl0cnVlCSMgRG8g cnVuIG10cmVlIHRvIGNyZWF0ZSBjaHJvb3QgZGlyZWN0b3JpZXMNCiAjTk9f QklORF9OQU1FRD0JCXRydWUJIyBEbyBub3QgYnVpbGQgbmFtZWQsIHJuZGMs IGx3cmVzZCwgZXRjLg0KICNOT19CSU5EX1VUSUxTPQkJdHJ1ZQkjIERvIG5v dCBidWlsZCBkaWcsIGhvc3QsIG5zbG9va3VwLCBuc3VwZGF0ZQ0KICNXSVRI X0JJTkRfTElCUz0JdHJ1ZQkjIEluc3RhbGwgdGhlIEJJTkQgbGlicyBhbmQg aW5jbHVkZSBmaWxlcw0KSW5kZXg6IHNoYXJlL21hbi9tYW41L21ha2UuY29u Zi41DQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL3Vzci9s b2NhbC9uY3ZzL3NyYy9zaGFyZS9tYW4vbWFuNS9tYWtlLmNvbmYuNSx2DQpy ZXRyaWV2aW5nIHJldmlzaW9uIDEuOTYNCmRpZmYgLXUgLXIxLjk2IG1ha2Uu Y29uZi41DQotLS0gc2hhcmUvbWFuL21hbjUvbWFrZS5jb25mLjUJMjcgU2Vw IDIwMDQgMDg6MjM6NDIgLTAwMDAJMS45Ng0KKysrIHNoYXJlL21hbi9tYW41 L21ha2UuY29uZi41CTUgT2N0IDIwMDQgMjM6NTM6MzMgLTAwMDANCkBAIC0y NCw3ICsyNCw3IEBADQogLlwiDQogLlwiICRGcmVlQlNEOiBzcmMvc2hhcmUv bWFuL21hbjUvbWFrZS5jb25mLjUsdiAxLjk2IDIwMDQvMDkvMjcgMDg6MjM6 NDIgZG91Z2IgRXhwICQNCiAuXCINCi0uRGQgU2VwdGVtYmVyIDI3LCAyMDA0 DQorLkRkIE9jdG9iZXIgNSwgMjAwNA0KIC5EdCBNQUtFLkNPTkYgNQ0KIC5P cw0KIC5TaCBOQU1FDQpAQCAtNjEyLDEyICs2MTIsMjMgQEANCiAuSXQgVmEg Tk9fQklORF9FVEMNCiAuUHEgVnQgYm9vbA0KIFNldCB0byBhdm9pZCBpbnN0 YWxsaW5nIHRoZSBkZWZhdWx0IGZpbGVzIHRvDQotLlBhIC9ldGMvbmFtZWRi IC4NCisuUGEgL3Zhci9uYW1lZC9ldGMvbmFtZWRiIC4NCiAuSXQgVmEgTk9f QklORF9MSUJTX0xXUkVTDQogLlBxIFZ0IGJvb2wNCiBTZXQgdG8gYXZvaWQg aW5zdGFsbGluZyB0aGUgbGlnaHR3ZWlnaHQgcmVzb2x2ZXIgbGlicmFyeSBp bg0KIC5QYSAvdXNyL2xpYiAuDQogVGhlIGxpYnJhcnkgdGhhdCBpcyBwcml2 YXRlIHRvIHRoZSBidWlsZCBzeXN0ZW0gbWF5IHN0aWxsIGJlIGJ1aWx0IGFz IG5lZWRlZC4NCisuSXQgVmEgTk9fQklORF9NVFJFRQ0KKy5QcSBWdCBib29s DQorU2V0IHRvIGF2b2lkIHJ1bm5pbmcNCisuWHIgbXRyZWUgOA0KK3RvIGNy ZWF0ZSB0aGUgY2hyb290IGRpcmVjdG9yeSBzdHJ1Y3R1cmUgdW5kZXINCisu UGEgL3Zhci9uYW1lZCAsDQorYW5kIGF2b2lkIGNyZWF0aW5nIGFuDQorLlBh IC9ldGMvbmFtZWRiDQorc3ltbGluayB0byB0aGUgY2hyb290IGRpcmVjdG9y eS4NCitUaGlzIG9wdGlvbiBzaG91bGQgdHlwaWNhbGx5IGJlIHVzZWQgdG9n ZXRoZXIgd2l0aA0KKy5WdCBOT19CSU5EX0VUQyAuDQogLkl0IFZhIE5PX0JJ TkRfTkFNRUQNCiAuUHEgVnQgYm9vbA0KIFNldCB0byBhdm9pZCBidWlsZGlu ZyBvciBpbnN0YWxsaW5nDQo= --0-1187536900-1097020635=:3095--