From nobody Mon Nov 07 04:24:06 2022 X-Original-To: freebsd-current@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N5J5j30vyz4gqw1 for ; Mon, 7 Nov 2022 04:24:09 +0000 (UTC) (envelope-from grahamperrin@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N5J5j1fhWz4L4G for ; Mon, 7 Nov 2022 04:24:09 +0000 (UTC) (envelope-from grahamperrin@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667795049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=LzSmJj4Yza70XendJPk1XXbD1SHUHc00hy7Jybig99I=; b=AQRU4NRz0LctQiuT538XKWNUpMx4G24wmyybD0lvQ9PU8QJVeyxBy6VouWpFv/+e1gsyTi afyc0ZI4aP1ZAibe1+sAqujsK8ECnaDqusSiKF9pTIoAcYU+C00ePX8H/BQFi0YvAFJKoz UHkczrh2Pbjkrqt8X2fHbGPzp70ivLdMglRcPrSzNdYgUvrDBgIR7qq4Hu4E5bxdczPZQL UIGxA3c3z47fXUWQM9u7ne3yxA7XlX7G86H8hPqwGNc4MIxdrf3kFJ92ZKd8EVIyKIVFZW 6PSn0jyjs13o1weqmkeV4J0AIZLFV4+16M0zc6ktqe/SjZ428UajmzJGTl+Anw== Received: from [IPV6:2001:470:1f1c:a0::2] (tunnel642390-pt.tunnel.tserv1.lon2.ipv6.he.net [IPv6:2001:470:1f1c:a0::2]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: grahamperrin) by smtp.freebsd.org (Postfix) with ESMTPSA id 4N5J5h64cpz1JRp for ; Mon, 7 Nov 2022 04:24:08 +0000 (UTC) (envelope-from grahamperrin@freebsd.org) Message-ID: <37b896e9-14c5-5e12-42c2-f38aa648f413@freebsd.org> Date: Mon, 7 Nov 2022 04:24:06 +0000 List-Id: Discussions about the use of FreeBSD-current List-Archive: https://lists.freebsd.org/archives/freebsd-current List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-current@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.4.1 Content-Language: en-GB To: freebsd-current@freebsd.org References: <20221021175142.GA62386@www.zefox.net> <0697DE1F-C626-4289-894A-4141CDF1B91B@yahoo.com> <71AB9FAC-EB00-48F0-B0DD-0629C2D3C8C0@googlemail.com> <5719632F-8A92-4784-88D8-EAE3F20F2FA3@yahoo.com> <20221024174930.GA79381@www.zefox.net> <20221025005012.GA80394@www.zefox.net> <605A6723-5D31-495C-8200-FD107115FC81@yahoo.com> <20221106031204.GA45827@www.zefox.net> <20221106210716.1c997091ca40ea02ede9f159@dec.sakura.ne.jp> From: Graham Perrin Subject: Re: Seeking an idiot's guide to etcupdate/mergemaster Organization: FreeBSD In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------v0VgYj9tJAMgGWDHm0TRLopS" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667795049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=LzSmJj4Yza70XendJPk1XXbD1SHUHc00hy7Jybig99I=; b=tC+PFj/LoOX+N+wfV8NgJbi2bI+e2e5XdziiSRX3NBS/9oZkpK9rhL/nLE8kHlmEqJG2gB q6ms85+bBizMLL7ZdNwi7dFPVakzzp3zIg/kv78D5VVSj59PEuVMxadTw4q9CZ3MQupERd UC7o0F0Xg+pwedKdk/F86y4+aH8JQlgXGnck0zCG6SHj43ud1Iw+2TfRTqsNieTSw6xNRS riwPMCbzmgbv/ocvpi5WgF9FNjN9Pjo10sWIinUNpm9BlEz5s/XvZDBS1qL777uJjHmE0n IAGzxVSGWIA9rY7OW2wZeEScLe87yi4gc3pTLr+qhSllAQ5PptkV5K2G7N5FAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667795049; a=rsa-sha256; cv=none; b=WAADp2v3AR3QRx+xJF0fEvUI5atL2wqIEhpSZw9GPrQAo7lQfID91f/kbVkcmcVqxT7sTO LV50qUFpmrBlVslAecqJAnGkwXCE9/FgG98Q8mQcFy57HL6qXKY+GTUerz+B/2aHakxKly 8j1sjYbuFCX4ED8XeNFSLKLaoz44x8MbDzwta60AJ3CpizBJERSTaTIswDGwWkGTT0pNZm KpzC4bwtMu+XmPWyzEHtNhnKwcLeg8khjzIEKP8AUzmwIb8BwNNPO80dsUPfOvfdTv3pSG BXmPnBZ4O5qZXqcsYsdXTDnBWJJ4+opR7yULEnywBnVf5vw3MY7Rw1leF9eiPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------v0VgYj9tJAMgGWDHm0TRLopS Content-Type: multipart/mixed; boundary="------------aaShFLVSlFdU6oOzxstdc0n8"; protected-headers="v1" From: Graham Perrin To: freebsd-current@freebsd.org Message-ID: <37b896e9-14c5-5e12-42c2-f38aa648f413@freebsd.org> Subject: Re: Seeking an idiot's guide to etcupdate/mergemaster References: <20221021175142.GA62386@www.zefox.net> <0697DE1F-C626-4289-894A-4141CDF1B91B@yahoo.com> <71AB9FAC-EB00-48F0-B0DD-0629C2D3C8C0@googlemail.com> <5719632F-8A92-4784-88D8-EAE3F20F2FA3@yahoo.com> <20221024174930.GA79381@www.zefox.net> <20221025005012.GA80394@www.zefox.net> <605A6723-5D31-495C-8200-FD107115FC81@yahoo.com> <20221106031204.GA45827@www.zefox.net> <20221106210716.1c997091ca40ea02ede9f159@dec.sakura.ne.jp> In-Reply-To: --------------aaShFLVSlFdU6oOzxstdc0n8 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 ZXRjdXBkYXRlDQo9PT09PT09PT0NCg0KT24gMDYvMTEvMjAyMiAxNzozNSwgR2VvcmdlIE1p Y2hhZWxzb24gd3JvdGU6DQoNCj4gSSBhbSBwcm9iYWJseSBhbG9uZSBpbiB0aGlzDQoNCllv dSdyZSBub3QgYWxvbmUuDQoNCg0KPiDigKYgSSBmaW5kIHRoZSDigKYgPDw8PDwvPj4+Pj4N Cj4gbWFya2VycyBpbiB0aGUgdXBkYXRlIGRpZmZzIGludGVuc2VseSBjb25mdXNpbmcuDQoN CmRpZmYzIGJyYWNrZXRpbmcuDQoNCjw8PDw8PDwgaXMgd2hlcmUgYSBjb25mbGljdCBiZWdp bnMsDQogPj4+Pj4+PiBpcyB3aGVyZSBpdCBlbmRzLg0KDQpCZXlvbmQgdGhhdCwgaXQgd2Fz IGRpZmZpY3VsdCBmb3IgbWUgdG8gZmluZCBhbiBleHBsYW5hdGlvbiB0aGF0J3Mgc2ltcGxl Lg0KDQpJbiB0aGUgbWlkc3Qgb2YgYSBsb25nIHBhZ2UgZnJvbSB0d2VudHktbmluZSB5ZWFy cyBhZ286DQoNCjxodHRwOi8vd3d3LmhwY2MuZWNzLnNvdG9uLmFjLnVrL2hwY2kvdG9vbHMv Y3ZzL2h0bWwvZGlmZi5odG1sI1NFQzUzPiANCmJlZ2lucyB3aXRoIHNpbXBsaWNpdHkuDQoN CjxodHRwczovL2dpdGh1Yi5jb20vZnJlZWJzZC9mcmVlYnNkLXNyYy9jb21taXQvYTcyMTJl NTcyMWJhZWIzMWViMTA0YzQ4MjljZGYyMGM1ODk2OTQ2Mz4gDQooMjAxNi0wOC0wNSkgcHV0 cyBkaWZmMygxKSBpbiB0aGUgY29udGV4dCBvZiBldGN1cGRhdGUoOCkuDQoNCjxodHRwczov L3d3dy5mcmVlYnNkLm9yZy9jZ2kvbWFuLmNnaT9xdWVyeT1kaWZmMyZzZWt0aW9uPTEmbWFu cGF0aD1GcmVlQlNEI1NFRV9BTFNPPiANCnN1Z2dlc3RzIGEgY29tbWFuZCB0aGF0IGhhcyBu byBlZmZlY3Q6DQoNCiDCoMKgwqAgaW5mbyBkaWZmMw0KDQotLS0tDQoNCkZvciBwZW9wbGUg d2hvIHByZWZlciBjb21wbGV4aXR5LCBmcm9tIHRoZSBvdXRzZXQsIHdoZW4gYXR0ZW1wdGlu ZyB0byANCmdyYXNwIChvciByZW1lbWJlcikgc29tZXRoaW5nIHRoYXQncyBuZXcsIG9yIGNv bXBsZXg6DQoNCjxodHRwczovL2Jsb2cuamNvZ2xhbi5jb20vMjAxNy8wNS8wOC9tZXJnaW5n LXdpdGgtZGlmZjMvPg0KDQrigJMgdGhlIHRlYW0gaW5jbHVkZXMgQWxpY2UgYW5kIEJvYiBk ZXZlbG9waW5nIGEgcmVjaXBlIGJvb2sgd2l0aCBhIHNvdXAgDQp3aXRoIHNpeCBpbmdyZWRp ZW50cywgb25lIG9mIHdoaWNoIGlzIGEgY29tbW9uIGFsbGVyZ2VuIOKAkyBjZWxlcnksIA0K Z2FybGljLCBvbmlvbnMsIHNhbG1vbiwgdG9tYXRvZXMsIHdpbmUg4oCTIHRoaW5ncyBnZXQg Y2h1bmt5IHdoZW4gYm90aCANCkFsaWNlIGFuZCBCb2IgZGlmZmVyIGZyb20gdGhlIG9yaWdp bmFsIGFuZCBuZWl0aGVyIEFkYW0gbm9yIEV2ZSBhcmUgDQplbWl0dGVkOyBhZGFwdGVkIGZy b20gS2hhbm5hLCBTLiwgS3VuYWwsIEsuLCBQaWVyY2UsIEIuQy4gKDIwMDcpLiBBIA0KRm9y bWFsIEludmVzdGlnYXRpb24gb2YgRGlmZjMuIEluOiBBcnZpbmQsIFYuLCBQcmFzYWQsIFMu IChlZHMpIEZTVFRDUyANCjIwMDc6IEZvdW5kYXRpb25zIG9mIFNvZnR3YXJlIFRlY2hub2xv Z3kgYW5kIFRoZW9yZXRpY2FsIENvbXB1dGVyIA0KU2NpZW5jZS4gRlNUVENTIDIwMDcuIExl Y3R1cmUgTm90ZXMgaW4gQ29tcHV0ZXIgU2NpZW5jZSwgdm9sIDQ4NTUuIA0KU3ByaW5nZXIs IEJlcmxpbiwgSGVpZGVsYmVyZy4gaHR0cHM6Ly9kb2kub3JnLzEwLjEwMDcvOTc4LTMtNTQw LTc3MDUwLTNfNDANCg0KOi0pDQoNCg0KPiBHaXZlbiBtYW55IG1lcmdlcyBhcmUNCj4gbGFy Z2UgYmxvY2tzLCBpdHMgYWxtb3N0IGltcG9zc2libGUgdG8ga2VlcCBjb250ZXh0IGZsaXR0 aW5nIGFib3V0IGluDQo+IHZpIOKApg0KDQo8aHR0cHM6Ly9yZXZpZXdzLmZyZWVic2Qub3Jn L0QzNjc4Nj4NCg0KDQo+IFRMO0RSIHRoZSBtZXJnZSBwcm9jZXNzIGZvciBGcmVlQlNELXVw ZGF0ZSBhbmQgbGlrZSwgY2FuIGJlIGludGVuc2VseQ0KPiBjb25mdXNpbmcgd2hlbiB5b3Ug dHJ5IHRvIHJlY29uY2lsZSB3aGF0IGl0IHRlbGxzIHlvdSBhYm91dCAvZXRjLw0KPg0KPiAt Rw0KPg0KPiBPbiBTdW4sIE5vdiA2LCAyMDIyIGF0IDEyOjA3IFBNIFRvbW9ha2kgQU9LSSA8 anVuY2hvb25AZGVjLnNha3VyYS5uZS5qcD4gd3JvdGU6DQo+IOKApg0K --------------aaShFLVSlFdU6oOzxstdc0n8-- --------------v0VgYj9tJAMgGWDHm0TRLopS Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEEWT/lssMHB+28ly8Kt2dIb0oY1AsFAmNoiGcFAwAAAAAACgkQt2dIb0oY1AuA fw//UuRIadxVwCDGBhvuMaGUIFGoqdoCrDr6HT16Ubtv9r+5W3CgthyVmpQ5Yx2WiOVS1adr1NQC a8hJbv6nWDJpMHiGmR3J+VeLjLPEoqiNZyvhZ3T0nH4Mrr0v1SJIUtggDV5Uqn8M27fsM/Dm9ZHr EbaCPGmFnhJASPcBNY+3ovam2BkEuwge6alj550wsm+53XzC492dnuT2XKBA/b3/BwD6LdH05Ol5 HLmNLE3Czu7GtOCYEXaJ7K552HSmWbxS1qRxK/fAHj3DlKh7if6I4I85mLsIoBARBLoKVTPpHGJ8 cuBabFaq5P5Wc3ITT0d7XLCj1QAfz5JxVEtUBRLPns9GCerqDozTn4HrJxFGQOQqPXTJ7ELbigAx XhYkGgf3zRtOcbrVUM4QmLBAVFjLiKhiGz5ya/uNpvGlkq0zcOuCleCCAMRT8i3FlwHNtW/hl16O I3WyPqWuMHIfB6A4SQ3neRHC+7g7UkjiV+u3jLuTj0R1hQ1GdYb4AwcSt7C5Lrc9j/pLIj/0mbm8 wyH+ztGQSZlNqhVuLmMS87X9Y5gMIMokabtLoYwDTmuSOYw+qsQ34xUx57mydEHha0nKKhmGvv1H G/GWd6K5BjxX8VloVntFwnux7AP4tNiVT9MXpZYQ1bwMnyDHLzNuqBe7ownABBu/j8ysammNz7Tw t+Y= =YAwX -----END PGP SIGNATURE----- --------------v0VgYj9tJAMgGWDHm0TRLopS--