From nobody Fri Nov 03 20:20:25 2023 X-Original-To: freebsd-stable@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 4SMXDZ0Tw7z50F2t for ; Fri, 3 Nov 2023 20:20:30 +0000 (UTC) (envelope-from dean.weimer@outlook.com) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02olkn2080d.outbound.protection.outlook.com [IPv6:2a01:111:f400:7ea9::80d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "DigiCert Cloud Services CA-1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SMXDY1tCLz3GlM for ; Fri, 3 Nov 2023 20:20:29 +0000 (UTC) (envelope-from dean.weimer@outlook.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=outlook.com header.s=selector1 header.b=U8lscbyn; arc=pass ("microsoft.com:s=arcselector9901:i=1"); spf=pass (mx1.freebsd.org: domain of dean.weimer@outlook.com designates 2a01:111:f400:7ea9::80d as permitted sender) smtp.mailfrom=dean.weimer@outlook.com; dmarc=pass (policy=none) header.from=outlook.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z6XBxsevZnXAc5Eun03iMhP066vXJW1l7EQeVWdMXmjGrlhRZhTuxIaN0QLs83TO5kZOynGvJb1Ih/3yMnrQ2clTle29Xml7jwsqUXQWEn8geWhspEFjZacsoohTdQmlrhGkTXuH8Rnlmo2HGBuZvDk6if0/QMmeVuoXrcCUoI5jd4vrKLO7F09cijo37EC0SrMcc4iSuq3LjY4q6GRAtEOzL6BpWTgRDEWerXeCjc6NvqqZSoJf5TwN3/mUC6TXtlFqnJDusHa1CCYd2NEHJeg54qRtDOLanC6fXNiidjyHpF72ZC43IWpX0AKosen/zrN1rGFvNgLul+EgnQj7LQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=dKiuHSUi4hTqTk4HslM79MwEGiyKHQBDO2djfBbwy2A=; b=hC1XH7zoyRK38Reu4RH8IzbW+LBkLJtbDyIej3p/2BMXDFD1xc1iCmJpir32hzGh0YSiC4xXdE7SgX/L0Y8dAfIrsnxUAYToK8orrgLR7xErOLiFRyQ4s7MFY56xW8A6zp/SLF2NfcKysTkyZr9tQR8sKah4BkvqX9KmutAhNcuo3MDkHE2JCFxFhNsZc33im2YTeKXffVoUCfWLg4FKwvcxTokkkNCZv+wbpJcQ+t+ABBdaKHzDx7nD31P3lZvjDoNZUV9OMklTujEpDpMgYyo4LjrXELgPCbCN3eUkwdUxEgokkKK9PCfme5NDsm+uscs8P/5lWkZLObhHqfUfLg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dKiuHSUi4hTqTk4HslM79MwEGiyKHQBDO2djfBbwy2A=; b=U8lscbynZ+wueuTWtHJrIK2UoJyN/EOA1PdcjWYMg0YZVnDNKcch3OQpZoDpzfapQk12pWc0EY8Kh7rAnJWzneF4+U0ObRfmL/TW6RXN9ZL3xcuyxvlCFDG4pOqDlviT0dAZZVfxlMIbO9AEqNqeUoWNoVcgpytvNNBmA7m9/gOcqd9GP58UE39l+05q8d6lC5fPN3OvQMJPrIslpfJ9T283b32bPVBB6vo5KyR1d9qAq5z346epZXN3qSGY8Pk63yTxS2RKWwOPxXSX0pJnOfENocpLQlGRYWbfU24K3YqF9HP9YAl/2eTj0OAvLB3lJUqH0mpzAnd1no61JEtEWA== Received: from CH0PR19MB7951.namprd19.prod.outlook.com (2603:10b6:610:182::7) by MW3PR19MB4314.namprd19.prod.outlook.com (2603:10b6:303:48::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.21; Fri, 3 Nov 2023 20:20:26 +0000 Received: from CH0PR19MB7951.namprd19.prod.outlook.com ([fe80::7c41:493e:c079:e392]) by CH0PR19MB7951.namprd19.prod.outlook.com ([fe80::7c41:493e:c079:e392%4]) with mapi id 15.20.6954.021; Fri, 3 Nov 2023 20:20:25 +0000 From: Dean Weimer To: "freebsd-stable@freebsd.org" Subject: Help with etcupdate when using alternate source and destination. Thread-Topic: Help with etcupdate when using alternate source and destination. Thread-Index: AQHaDpMnpXnbM4kvXESfjfEvb4cr1A== Date: Fri, 3 Nov 2023 20:20:25 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [QXp7NKF/g0Rj9p0splpqng82Xu35j/b5] x-ms-publictraffictype: Email x-ms-traffictypediagnostic: CH0PR19MB7951:EE_|MW3PR19MB4314:EE_ x-ms-office365-filtering-correlation-id: 93bbb296-5a27-415e-5284-08dbdcaa50a9 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 7ZltLZ6W8WhMWboDUkFpDT2fl7DboRlouw5BTZe39UtBep2bdUtMUMy438skqlLMaU2AAGzezd2eYjITLPoeMALO8ssrWXMB8klSlzTBYKpb/AeDmkM3EAp8Fm4VY6QSEPiNq0uxE6YUqnQTIoOnhlSssaldeNaDqHlgNkrsTo2KtJwEer7VEZFJxzWxkbq8sDZTjnG2Ah90//aKwJ0y6WmNfSvJOE7otMBU/fWQR0Bc+ciWRuGplXDAW20pAgtccSDly/Ng4BV9IFYghCjxIdzYhAgHdeMpgLYpVePYS8kW5m6egcTQfF0dNc5bgGse5fLW/lXcxlfe3bCuMpUzcf7iNUxpcVydd4tuBXM+2CekQXhGTn8wwZFMMcQGOTJ+psrBPfxAIsMHfuKdu6uEqU9499kekSn+2yFs3rnzDs9eW3aR+0lEDCBL4lRYtluvAPipSGsaFWrwUPg0YMmegSW6d/yBZ7GRvV3DTeChsqw4YC+yYcmjlp9wLr35eTVTdNoh0Fam7mVhV/4lq7RHTSQWwDYkUHscchFRyF6JfXBjhXSsa5HSQ5qijT1aKM/1 x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?wT2wg7ufN/2556bdWGFi3ZcCPmL4tk9gq5uqKX8+MLsWyY/fa7ercE4ref?= =?iso-8859-1?Q?O+EvrFC5C7qRfGhwBqTZG2lrGe9e2CwndzDvHLGQogPN7g0ekDShl7Coz/?= =?iso-8859-1?Q?TZbExe8tT7WI/8NRpiDQ90V8YcHjusQJNW0YqBjZCwHXcItlQv5GTAO26c?= =?iso-8859-1?Q?Cp02Qh+FbT4VJ5coejXfx5sdhvSxxs0bHN+8IOwpyfM0PsxQidw0JxH5Dk?= =?iso-8859-1?Q?bnK1TNI9hVIxmbOXtVRjY0B+VD+gvcXCBITg9tsbohvNkl9hjHwuku1Qhc?= =?iso-8859-1?Q?/Dh3NRk3ts+gsRx0i8NbRaMQeknUceerNu1fVuvQtwFLN40Jzii60KXuFn?= =?iso-8859-1?Q?8eeHNqeMm1Ou6AeYnD+FbPyf4qjX3GprdH7vbV+dEwgAZi8vxoJGSrPULE?= =?iso-8859-1?Q?7t7SfO0/8tySP7EX9RQzrhoJLDxkODNxTDKPbURYxYdT5XmSvwo2DFhkR0?= =?iso-8859-1?Q?2R9wdFr6IXJd1OGS9wbSmdeFNvplI0zFgseTUDjqbjUGJzfKRCPFAc/LwB?= =?iso-8859-1?Q?Y51Dlv3YiJPMHiQaJPOJgD94nhTjNXJyk4jbrQIpijAo4mhdhpEX+mb7BJ?= =?iso-8859-1?Q?UYx+rHIP0k+7v0J2QtoG4VafrfM/JbzO79YmLy5QQYYjaA9m2uqcbZCrYj?= =?iso-8859-1?Q?2Z5AO8SQeJERwErHmd49pbLA3j8oioQe5hI9HPnOxfGgKZeK1BFn/wH0Ul?= =?iso-8859-1?Q?TwgZtulucZOPGmoAW0wkJEGeQIoncCJUbbYmagBVStMBtWuorrXnCH1TWs?= =?iso-8859-1?Q?VODQhQilurRjmJVWId3X9hK/5l2Ha40rcbYLanPHUdZ6MHM63MpynLtW8t?= =?iso-8859-1?Q?JRW6TogHOtOw2brzD4PEoe6gep8p/MqOrbISrJSKO5dEQacYkP+BHTwbv5?= =?iso-8859-1?Q?dtmEZYRRQ6Zlx747fSsbxhsyCvDfJv1zAkh9sQkb60ZdCJ5/GRXG8lsjBk?= =?iso-8859-1?Q?LGvr8eKEzLc2CCm3Agh+GCltkOPLoYxnJ34J8+szFJW17gqud8nAuvGLEy?= =?iso-8859-1?Q?uqqEIFpOmLwuiHf+yA0lGYl73aHhXL3hwmMDlGvqmibD07f5MnodmsNHHC?= =?iso-8859-1?Q?IVCmS+gIOqihSl+dXYaQSIDMDzLXdAjPl0TgeTMKAg0K1XWExCFBdmT6AR?= =?iso-8859-1?Q?yrc3jsE+1AiB9ghZBeDCEPwubAU9qDJBD7ZWD1RI0Q/9jYq1n2S0mEUTqu?= =?iso-8859-1?Q?v5eeMYxs4d2Q0toldJkizc956KV5CDlXntQuj7jI9Xuaaokfmx8SyCYotq?= =?iso-8859-1?Q?rOz/WyOoXx3Mn1xGsc4IGeFb4U+pNfItVGoq+fmgFFRvUIKDYp6YP4M02r?= =?iso-8859-1?Q?jERJ?= Content-Type: multipart/alternative; boundary="_000_CH0PR19MB7951474BCB3F0B8B6778705BB8A5ACH0PR19MB7951namp_" List-Id: Production branch of FreeBSD source code List-Archive: https://lists.freebsd.org/archives/freebsd-stable List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-stable@freebsd.org X-BeenThere: freebsd-stable@freebsd.org MIME-Version: 1.0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CH0PR19MB7951.namprd19.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 93bbb296-5a27-415e-5284-08dbdcaa50a9 X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Nov 2023 20:20:25.8571 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR19MB4314 X-Spamd-Result: default: False [-5.00 / 15.00]; ARC_ALLOW(-1.00)[microsoft.com:s=arcselector9901:i=1]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; DMARC_POLICY_ALLOW(-0.50)[outlook.com,none]; R_SPF_ALLOW(-0.20)[+ip6:2a01:111:f400::/48]; R_DKIM_ALLOW(-0.20)[outlook.com:s=selector1]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; MLMMJ_DEST(0.00)[freebsd-stable@freebsd.org]; TO_DN_EQ_ADDR_ALL(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FROM_EQ_ENVFROM(0.00)[]; FREEMAIL_ENVFROM(0.00)[outlook.com]; ASN(0.00)[asn:8075, ipnet:2a01:111:f000::/36, country:US]; RCVD_TLS_LAST(0.00)[]; MID_RHS_MATCH_FROMTLD(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_HAS_DN(0.00)[]; DKIM_TRACE(0.00)[outlook.com:+]; FREEMAIL_FROM(0.00)[outlook.com]; RCPT_COUNT_ONE(0.00)[1]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DWL_DNSWL_NONE(0.00)[outlook.com:dkim] X-Rspamd-Queue-Id: 4SMXDY1tCLz3GlM X-Spamd-Bar: ---- --_000_CH0PR19MB7951474BCB3F0B8B6778705BB8A5ACH0PR19MB7951namp_ Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Can anybody point me to a howto, when using etcupdate with alternate source= and destinations. I have been using ZFS with snapshots mounted to alternat= e paths to do my updates from source since I believe around 9.2 release. Me= rgemaster has been working for me, but I am trying to switch my process to = etcupdate instead and I am failing spectacularly. I have a /etc/src-env.conf file containing. WITH_META_MODE=3Dyes MAKEOBJDIRPREFIX?=3D/usr/obj DESTDIR=3D/jails/devel/ROOT __MAKE_CONF=3D/jails/devel/ROOT/etc/make.conf SRCCONF=3D/jails/devel/ROOT/etc/src.conf SRC_ENV_CONF=3D/jails/devel/ROOT/etc/src-env.conf This is my old process. I mount my snapshot to /jails/devel/ROOT run the following mount -t nullfs -o ro /usr/src /jails/devel/ROOT/usr/src cd /jails/devel/ROOT/usr/src make buildworld && make buildkernel make installkernel && make installworld mergemaster -Ui -m /jails/devel/ROOT/usr/src -D /jails/devel/ROOT make -DBATCH_DELETE_OLD_FILES delete-old && make -DBATCH_DELETE_OLD_FILES d= elete-old-libs I would then start a jail from this, update any packages check configuratio= ns and then stop jail and switch main system over. I use same system for pa= tch level updates, but would build a VM from fresh install for new major ve= rsions and ship snapshots over to it, build and then back to primary system= for reboot. First attempt at new process. mount my snapshot to /jails/devel/ROOT mount -t nullfs -o ro /usr/src /jails/devel/ROOT/usr/src cd /jails/devel/ROOT/usr/src etcupdate extract -s /usr/src_13.2-RELEASE-p4 -D /jails/devel/ROOT etcupdate diff -s /usr/src_13.2-RELEASE-p4 -D /jails/devel/ROOT # Diff looks as expected make buildworld && make buildkernel && make installkernel etcupdate -p -s /jails/devel/ROOT/usr/src -D /jails/devel/ROOT # PANIC: merge failed with status 127 #Logs end with: Building tree at /jails/devel/ROOT/var/db/etcupdate/etcupdate-YyFRXe8 with = make -DNO_FILEMON /usr/sbin/etcupdate: diff3: not found # Get past this by running etcupdate extract -s /jails/devel/ROOT/usr/src -D /jails/devel/ROOT etcupdate diff -s /jails/devel/ROOT/usr/src -D /jails/devel/ROOT # Output looks as expected etcupdate -p -s /jails/devel/ROOT/usr/src -D /jails/devel/ROOT # returns with no errors make installworld etcupdate -B -s /jails/devel/ROOT/usr/src -D /jails/devel/ROOT # Returns with no errors, however nothing in system is updated I have trying added etcupdate resolve after the -p & -B runs, just returns = no errors, doesn't show any conflicts to resolve. I have been able to get system running on new version by falling back to ru= nning mergemaster command, but I have to edit some files manually as there = are a few changes that don't get merged correctly in the 13.2-RELEASE-p4 to= upgrade 14.0-RC. --_000_CH0PR19MB7951474BCB3F0B8B6778705BB8A5ACH0PR19MB7951namp_ Content-Type: text/html; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable
Can anybody point me to a howto, when using etcupdate with alternate source= and destinations. I have been using ZFS with snapshots mounted to alternat= e paths to do my updates from source since I believe around 9.2 release. Me= rgemaster has been working for me, but I am trying to switch my process to etcupdate instead and I am failing= spectacularly.

I have a /etc/src-env.conf file containing.
WITH_META_MODE=3Dyes
MAKEOBJDIRPREFIX?=3D/usr/obj
DESTDIR=3D/jails/devel/ROOT
__MAKE_CONF=3D/jails/devel/ROOT/etc/make.conf
SRCCONF=3D/jails/devel/ROOT/etc/src.conf
SRC_ENV_CONF=3D/jails/devel/ROOT/etc/src-env.conf

This is my old process.
I mount my snapshot to /jails/devel/ROOT
run the following
mount -t nullfs -o ro /usr/src /jails/devel/ROOT/usr/src
cd /jails/devel/ROOT/usr/src
make buildworld && make buildkernel
make installkernel && make installworld
mergemaster -Ui -m /jails/devel/ROOT/usr/src -D /jails/devel/ROOT
make -DBATCH_DELETE_OLD_FILES delete-old && make -DBATCH_DELETE_OLD= _FILES delete-old-libs

I would then start a jail from this, update any packages check configuratio= ns and then stop jail and switch main system over. I use same system for pa= tch level updates, but would build a VM from fresh install for new major ve= rsions and ship snapshots over to it, build and then back to primary system for reboot.

First attempt at new process.
mount my snapshot to /jails/devel/ROOT
mount -t nullfs -o ro /usr/src /jails/devel/ROOT/usr/src
cd /jails/devel/ROOT/usr/src
etcupdate extract -s /usr/src_13.2-RELEASE-p4 -D /jails/devel/ROOT
etcupdate diff -s /usr/src_13.2-RELEASE-p4 -D /jails/devel/ROOT
# Diff looks as expected
make buildworld && make buildkernel && make installkernel etcupdate -p -s /jails/devel/ROOT/usr/src -D /jails/devel/ROOT
# PANIC: merge failed with status 127
#Logs end with:
Building tree at /jails/devel/ROOT/var= /db/etcupdate/etcupdate-YyFRXe8 with make -DNO_FILEMON
/usr/sbin/etcupdate: diff3: not found
# Get past this by running
etcupdate extract -s /jails/devel/ROOT/usr/src -D /jails/devel/ROOT
etcupdate diff -s /jails/devel/ROOT/usr/src -D /jails/devel/ROOT
# Output looks as expected
etcupdate -p -s /jails/devel/ROOT/usr/src -D /jails/devel/ROOT
# returns with no errors
make installworld
etcupdate -B -s /jails/devel/ROOT/usr/src -D /jails/devel/ROOT
# Returns with no errors, however nothing in system is updated

I have trying added etcupdate resolve after the -p & -B runs, just retu= rns no errors, doesn't show any conflicts to resolve.

I have been able to get system running on new version by falling back to ru= nning mergemaster command, but I have to edit some files manually as there = are a few changes that don't get merged correctly in the 13.2-RELEASE-p4 to= upgrade 14.0-RC.

--_000_CH0PR19MB7951474BCB3F0B8B6778705BB8A5ACH0PR19MB7951namp_--