Date: Mon, 9 May 2022 22:37:25 -0600 From: Gary Aitken <freebsd@dreamchaser.org> To: questions@freebsd.org Subject: Re: resolving merges on upgrade Message-ID: <0612d131-9435-4535-adfd-e409994279ad@dreamchaser.org> In-Reply-To: <c37698a8-2060-9364-90d4-a32b05b3e6f0@dreamchaser.org> References: <c37698a8-2060-9364-90d4-a32b05b3e6f0@dreamchaser.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?0612d131-9435-4535-adfd-e409994279ad>