Date: Wed, 18 Nov 2020 12:23:45 -0700 From: Warner Losh <imp@bsdimp.com> To: Yasuhiro KIMURA <yasu@utahime.org> Cc: FreeBSD Current <freebsd-current@freebsd.org> Subject: Re: /etc/os-release isn't created Message-ID: <CANCZdfr3Rj5fMBC0s=aoKLrQEiSOsVftH9adUwRMHm=jv7AF9Q@mail.gmail.com> In-Reply-To: <20201118.201439.1502496832985621878.yasu@utahime.org> References: <20191125011135.GA69956@mail.bsd4all.net> <20191125.102736.1372422754370589145.yasu@utahime.org> <20200122.155654.980180717476039692.yasu@utahime.org> <20201118.201439.1502496832985621878.yasu@utahime.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, Nov 18, 2020 at 4:16 AM Yasuhiro KIMURA <yasu@utahime.org> wrote: > Dear Committers, > > From: Yasuhiro KIMURA <yasu@utahime.org> > Subject: Re: /etc/os-release isn't created > Date: Wed, 22 Jan 2020 15:56:54 +0900 (JST) > > > I created patch adding logic that handles symbolik link to mergemaster > > and submitted it to following bug report. > > > > Bug 242212 usr.sbin/mergemaster/mergemaster.sh: There is no logic to > handle symbolic > > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=242212 > > > > So please review and/or test it. > > Would someone please commit it? As is explained currently mergemaster > doesn't handle symbolic links. And it causes that /etc/os-release > symbolink link isn't created when it doesn't exit before upgrade and > you upgrade base system with steps described in /usr/src/Makefile. > It happens such cases as following. > > * 13-CURRENT before r354922 -> 13-CURRENT r354922 or later > * 12.1-RELEASE -> 12.2-RELEASE > * 11.4-RELEASE -> 12.2-RELEASE > I did some light testing and it seemed to work for me, so I've gone ahead and committed it as r367810. Thanks for the reminder.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfr3Rj5fMBC0s=aoKLrQEiSOsVftH9adUwRMHm=jv7AF9Q>