From nobody Tue May 10 04:37:25 2022 X-Original-To: questions@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 D60081ACB3FE for ; Tue, 10 May 2022 04:37:35 +0000 (UTC) (envelope-from freebsd@dreamchaser.org) Received: from nightmare.dreamchaser.org (ns.dreamchaser.org [66.109.141.57]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "dreamchaser.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ky4yk5HBRz3KSc for ; Tue, 10 May 2022 04:37:34 +0000 (UTC) (envelope-from freebsd@dreamchaser.org) Received: from breakaway.dreamchaser.org (breakaway [192.168.151.122]) by nightmare.dreamchaser.org (8.15.2/8.15.2) with ESMTP id 24A4bPgv038544 for ; Mon, 9 May 2022 22:37:26 -0600 (MDT) (envelope-from freebsd@dreamchaser.org) Subject: Re: resolving merges on upgrade To: questions@freebsd.org References: Reply-To: freebsd@dreamchaser.org From: Gary Aitken Message-ID: <0612d131-9435-4535-adfd-e409994279ad@dreamchaser.org> Date: Mon, 9 May 2022 22:37:25 -0600 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.6.1 List-Id: User questions List-Archive: https://lists.freebsd.org/archives/freebsd-questions List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-questions@freebsd.org X-BeenThere: freebsd-questions@freebsd.org MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (nightmare.dreamchaser.org [192.168.151.101]); Mon, 09 May 2022 22:37:26 -0600 (MDT) X-Rspamd-Queue-Id: 4Ky4yk5HBRz3KSc X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of freebsd@dreamchaser.org designates 66.109.141.57 as permitted sender) smtp.mailfrom=freebsd@dreamchaser.org X-Spamd-Result: default: False [-3.27 / 15.00]; HAS_REPLYTO(0.00)[freebsd@dreamchaser.org]; ARC_NA(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+mx]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[questions@freebsd.org]; REPLYTO_ADDR_EQ_FROM(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-1.00)[-1.000]; TO_DN_NONE(0.00)[]; NEURAL_HAM_SHORT(-1.00)[-1.000]; DMARC_NA(0.00)[dreamchaser.org]; NEURAL_HAM_MEDIUM(-0.97)[-0.966]; MLMMJ_DEST(0.00)[questions]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:21947, ipnet:66.109.128.0/19, country:US]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_LAST(0.00)[] X-ThisMailContainsUnwantedMimeParts: N One more try, as I didn't get any responses and I'm reluctant to proceed > I'm in the process of doing an upgrade from 11.4-RELEASE to 12.3-RELEASE.> I teed the output of upgrade to get a copy of the output: > freebsd-update -r 12.3-RELEASE upgrade | tee /some-path.log > At some point it complains that > it can't merge some files in /etc, and that it can't invoke vi > because vi's stdin and stdout must be a terminal. Then "do the > changes look reasonable" > > So... I said yes thinking I would look at them later before > continuing. However, I can't find the merged output of the files of concern. > Before doing a /usr/sbin/freebsd-update install where can I find the > newly accepted merged file so I can look at it? > > I tried find / | grep etc/passwd and only found the old version in > /etc/passwd.