Date: Sat, 12 Jul 2014 20:08:52 -0600 (MDT) From: Warren Block <wblock@wonkity.com> To: freebsd-jail@FreeBSD.org Subject: mergemaster and better support for ezjails Message-ID: <alpine.BSF.2.11.1407121753240.50320@wonkity.com>
next in thread | raw e-mail | index | archive | help
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
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.
2. If /etc/localtime in the jail is a plain file, as when tzsetup has
been run in the jail, tzsetup reinstalls the same file. It will come
from the host, but at first glance this does not seem to be a
problem, seeing that jails should be updated after the host has been
updated. Because /usr/share/zoneinfo does not exist in the jail, I
did not see a clean way to use tzsetup -C. A link could be created
to the basejail's /usr/share/zoneinfo, then deleted after
tzsetup -C has run, or maybe there is a better way.
--3512871622-143809998-1405217332=:50320
Content-Type: TEXT/PLAIN; charset=US-ASCII; name=mergemaster-ezjail.diff
Content-Transfer-Encoding: BASE64
Content-ID: <alpine.BSF.2.11.1407122008520.50320@wonkity.com>
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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?alpine.BSF.2.11.1407121753240.50320>