From owner-freebsd-jail@FreeBSD.ORG Sun Jul 13 05:37:48 2014 Return-Path: Delivered-To: freebsd-jail@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AAD24833 for ; Sun, 13 Jul 2014 05:37:48 +0000 (UTC) Received: from sola.nimnet.asn.au (paqi.nimnet.asn.au [115.70.110.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E0D7425D8 for ; Sun, 13 Jul 2014 05:37:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by sola.nimnet.asn.au (8.14.2/8.14.2) with ESMTP id s6D5bfRT059556; Sun, 13 Jul 2014 15:37:41 +1000 (EST) (envelope-from smithi@nimnet.asn.au) Date: Sun, 13 Jul 2014 15:37:41 +1000 (EST) From: Ian Smith To: Warren Block Subject: Re: mergemaster and better support for ezjails In-Reply-To: Message-ID: <20140713152442.K50382@sola.nimnet.asn.au> References: MIME-Version: 1.0 Content-Type: MULTIPART/Mixed; BOUNDARY="3512871622-143809998-1405217332=:50320" Content-ID: <20140713152442.U50382@sola.nimnet.asn.au> Cc: freebsd-jail@freebsd.org X-BeenThere: freebsd-jail@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "Discussion about FreeBSD jail\(8\)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jul 2014 05:37:48 -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. --3512871622-143809998-1405217332=:50320 Content-Type: TEXT/PLAIN; FORMAT=flowed; CHARSET=US-ASCII Content-ID: <20140713152442.M50382@sola.nimnet.asn.au> On Sat, 12 Jul 2014 20:08:52 -0600, Warren Block wrote: > A couple of patches to make mergemaster work better with ezjails. > > These are only very superficially tested. Feedback welcome. > > 1. If /etc/mergemaster.rc exists in the jail, it is sourced. This > allows IGNORE_FILES to be set in the jail. And other settings, but > that's the one I wanted. # Read /etc/mergemaster.rc first so the one in $HOME can override # if [ -r /etc/mergemaster.rc ]; then - . /etc/mergemaster.rc + . "${DESTDIR}/etc/mergemaster.rc" fi # Read .mergemasterrc before command line so CLI can override # if [ -r "$HOME/.mergemasterrc" ]; then - . "$HOME/.mergemasterrc" + . "${DESTDIR}/$HOME/.mergemasterrc" fi Maybe a dumb question, but .. In both cases, don't we need to test the readability of those files with ${DESTDIR} prepended, rather than the originals, before sourcing them? Or can we here safely assume that they will exist? Or doesn't it matter? cheers, Ian --3512871622-143809998-1405217332=:50320 Content-Type: TEXT/PLAIN; CHARSET=US-ASCII; NAME=mergemaster-ezjail.diff Content-Transfer-Encoding: BASE64 Content-ID: Content-Description: Content-Disposition: ATTACHMENT; FILENAME=mergemaster-ezjail.diff LS0tIC91c3Ivc3JjL3Vzci5zYmluL21lcmdlbWFzdGVyL21lcmdlbWFzdGVy LnNoCTIwMTQtMDYtMDMgMDY6MTY6MDYuMDAwMDAwMDAwIC0wNjAwDQorKysg L3Vzci9zYmluL21lcmdlbWFzdGVyCTIwMTQtMDctMTIgMTk6NDA6MjIuMDAw MDAwMDAwIC0wNjAwDQpAQCAtMjUxLDE2ICsyNTEsMjkgQEANCiAjDQogVEVN UFJPT1Q9Jy92YXIvdG1wL3RlbXByb290Jw0KIA0KKyMgT3B0aW9ucyBzdHJp bmcgZm9yIGdldG9wdHMNCitPUFRfU1RSPSI6YXNjcnZoaXBDUG06dDpkdTp3 OkE6RDpGVSINCisNCisjIGlmIC1EIERFU1RESVIgaXMgc2V0LCBwcm9jZXNz IGl0IGZpcnN0DQorREVTVERJUj0iIg0KK3doaWxlIGdldG9wdHMgIiR7T1BU X1NUUn0iIENPTU1BTkRfTElORV9BUkdVTUVOVCA7IGRvDQorICBjYXNlICIk e0NPTU1BTkRfTElORV9BUkdVTUVOVH0iIGluDQorICBEKQ0KKyAgICBERVNU RElSPSR7T1BUQVJHfQ0KKyAgICA7Ow0KKyAgZXNhYw0KK2RvbmUNCisNCiAj IFJlYWQgL2V0Yy9tZXJnZW1hc3Rlci5yYyBmaXJzdCBzbyB0aGUgb25lIGlu ICRIT01FIGNhbiBvdmVycmlkZQ0KICMNCiBpZiBbIC1yIC9ldGMvbWVyZ2Vt YXN0ZXIucmMgXTsgdGhlbg0KLSAgLiAvZXRjL21lcmdlbWFzdGVyLnJjDQor ICAuICIke0RFU1RESVJ9L2V0Yy9tZXJnZW1hc3Rlci5yYyINCiBmaQ0KIA0K ICMgUmVhZCAubWVyZ2VtYXN0ZXJyYyBiZWZvcmUgY29tbWFuZCBsaW5lIHNv IENMSSBjYW4gb3ZlcnJpZGUNCiAjDQogaWYgWyAtciAiJEhPTUUvLm1lcmdl bWFzdGVycmMiIF07IHRoZW4NCi0gIC4gIiRIT01FLy5tZXJnZW1hc3RlcnJj Ig0KKyAgLiAiJHtERVNURElSfS8kSE9NRS8ubWVyZ2VtYXN0ZXJyYyINCiBm aQ0KIA0KIGZvciB2YXIgaW4gIiRAIiA7IGRvDQpAQCAtMjc5LDcgKzI5Miw4 IEBADQogDQogIyBDaGVjayB0aGUgY29tbWFuZCBsaW5lIG9wdGlvbnMNCiAj DQotd2hpbGUgZ2V0b3B0cyAiOmFzY3J2aGlwQ1BtOnQ6ZHU6dzpEOkE6RlUi IENPTU1BTkRfTElORV9BUkdVTUVOVCA7IGRvDQorT1BUSU5EPTENCit3aGls ZSBnZXRvcHRzICIke09QVF9TVFJ9IiBDT01NQU5EX0xJTkVfQVJHVU1FTlQg OyBkbw0KICAgY2FzZSAiJHtDT01NQU5EX0xJTkVfQVJHVU1FTlR9IiBpbg0K ICAgQSkNCiAgICAgQVJDSFNUUklORz0nVEFSR0VUX0FSQ0g9JyR7T1BUQVJH fQ0KQEAgLTM0NCw3ICszNTgsNyBAQA0KICAgICBTQ1JFRU5fV0lEVEg9JHtP UFRBUkd9DQogICAgIDs7DQogICBEKQ0KLSAgICBERVNURElSPSR7T1BUQVJH fQ0KKyAgICAjIGhhcyBhbHJlYWR5IGJlZW4gcHJvY2Vzc2VkDQogICAgIDs7 DQogICAqKQ0KICAgICBkaXNwbGF5X3VzYWdlDQpAQCAtMTMzNSwxMCArMTM0 OSwyMCBAQA0KIA0KIGlmIFsgLWUgIiR7REVTVERJUn0vZXRjL2xvY2FsdGlt ZSIgLWEgISAtTCAiJHtERVNURElSfS9ldGMvbG9jYWx0aW1lIiAtYSAteiAi JHtQUkVfV09STER9IiBdOyB0aGVuCSMgSWdub3JlIGlmIFRaID09IFVUQw0K ICAgZWNobyAnJw0KLSAgWyAtbiAiJHtERVNURElSfSIgXSAmJiB0enNfYXJn cz0iLUMgJHtERVNURElSfSINCi0gIGlmIFsgLWYgIiR7REVTVERJUn0vdmFy L2RiL3pvbmVpbmZvIiBdOyB0aGVuDQotICAgIGVjaG8gIioqKiBSZWluc3Rh bGxpbmcgYGNhdCAke0RFU1RESVJ9L3Zhci9kYi96b25laW5mb2AgYXMgJHtE RVNURElSfS9ldGMvbG9jYWx0aW1lIg0KLSAgICB0enNldHVwICR0enNfYXJn cyAtcg0KKyAgaWYgWyAtbiAiJHtERVNURElSfSIgXTsgdGhlbg0KKyAgICBT SEFSRT0iJHtERVNURElSfS91c3Ivc2hhcmUiDQorICAgIFpPTkVfSU5GTz0i JHtTSEFSRX0vem9uZWluZm8iDQorICAgIGlmIFsgLUwgIiR7U0hBUkV9IiAt YSAhIC1lICIke1pPTkVfSU5GT30iIF07IHRoZW4NCisgICAgICAjIC91c3Iv c2hhcmUgaXMgYSBsaW5rLCAvdXNyL3NoYXJlL3pvbmVpbmZvIGRvZXMgbm90 IGV4aXN0LCB0aGlzIGlzIGFuIGV6amFpbA0KKyAgICAgIHR6c19hcmdzPSIt ciBcIiR7REVTVERJUn1cIiINCisgICAgZWxzZQ0KKyAgICAgICMgdGhpcyBp cyBhIGZ1bGwgamFpbA0KKyAgICAgIHR6c19hcmdzPSItciAtQyBcIiR7REVT VERJUn1cIiINCisgICAgZmkNCisgICAgaWYgWyAtZiAiJHtERVNURElSfS92 YXIvZGIvem9uZWluZm8iIF07IHRoZW4NCisgICAgICBlY2hvICIqKiogUmVp bnN0YWxsaW5nIGBjYXQgJHtERVNURElSfS92YXIvZGIvem9uZWluZm9gIGFz ICR7REVTVERJUn0vZXRjL2xvY2FsdGltZSINCisgICAgICB0enNldHVwICR0 enNfYXJncw0KKyAgICBmaQ0KICAgZWxzZQ0KICAgICBlY2hvICIqKiogVGhl cmUgaXMgbm8gJHtERVNURElSfS92YXIvZGIvem9uZWluZm8gZmlsZSB0byB1 cGRhdGUgJHtERVNURElSfS9ldGMvbG9jYWx0aW1lLiINCiAgICAgZWNobyAn ICAgIFlvdSBzaG91bGQgcnVuIHR6c2V0dXAnDQo= --3512871622-143809998-1405217332=:50320--