Date: Tue, 30 May 2023 10:05:15 -0700 From: Yetoo <yetoohappy@gmail.com> To: bob prohaska <fbsd@www.zefox.net> Cc: Alexander Leidinger <Alexander@leidinger.net>, Yuri <yuri@aetern.org>, freebsd-current@freebsd.org Subject: Re: Surprise null root password Message-ID: <CALT2f4tqdJphqm5xUW5bE3V=FAv53WUfXT3tG2eZSoz3EQJjAg@mail.gmail.com> In-Reply-To: <ZHYX9Qa5ZaRMMj1p@www.zefox.net> References: <ZHDt21wFlpJfQKEs@www.zefox.net> <945C9B6D-F2A8-4F0D-BDB0-49A3DE870168@karels.net> <ZHD%2BND6ilBGaOgcv@www.zefox.net> <CAG5KPzwLheqT_EuiexFRJuD4PyFNzyhCQfmToe4myr3K3YfKpQ@mail.gmail.com> <ZHEGpyKSWj4X/6Lk@www.zefox.net> <61e30711-f0da-2f42-3a6f-9bd91fc6b1ce@aetern.org> <ZHFADmqAmjJOCuIH@www.zefox.net> <20230530084133.Horde.4VevT2KY4XCtqoJgvP08jyB@webmail.leidinger.net> <ZHYX9Qa5ZaRMMj1p@www.zefox.net>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, May 30, 2023 at 8:36=E2=80=AFAM bob prohaska <fbsd@www.zefox.net> w= rote: > > On Tue, May 30, 2023 at 08:41:33AM +0200, Alexander Leidinger wrote: > > > > Quoting bob prohaska <fbsd@www.zefox.net> (from Fri, 26 May 2023 16:26:= 06 > > -0700): > > > > > On Fri, May 26, 2023 at 10:55:49PM +0200, Yuri wrote: > > > > > > > > The question is how you update the configuration files, > > > > mergemaster/etcupdate/something else? > > > > > > > > > > Via etcupdate after installworld. In the event the system > > > requests manual intervention I accept "theirs all". It seems > > > odd if that can null a root password. > > > > > > Still, it does seem an outside possibility. I could see it adding > > > system users, but messing with root's existing password seems a > > > bit unexpected. > > > > As you are posting to -current@, I expect you to report this issue abou= t > > 14-current systems. As such: there was a "recent" change (2021-10-20) t= o the > > root entry to change the shell. > > https://cgit.freebsd.org/src/commit/etc/master.passwd?id=3Dd410b585b6f0= 0a26c2de7724d6576a3ea7d548b7 > > > > By blindly accepting all changes, this has reset the PW to the default > > setting (empty). > > So it's a line-by-line merge. That's the most sensible explanation availa= ble. > > > > > I suggest to review changes ("df" instead of "tf" in etcupdate) to at l= east > > those files which you know you have modified, including the password/gr= oup > > stuff. After that you can decide if the diff which is shown with "df" c= an be > > applied ("tf"), or if you want to keep the old version ("mf"), or if yo= u > > want to modify the current file ("e", with both versions present in the= file > > so that you can copy/paste between the different versions and keep what= you > > need). > > > > The key sequences required to copy and paste between files in the edit sc= reen > were elusive. Probably it was thought self-evident, but not for me. I las= t tried > it long ago, via mergemaster. Is there is a guide to commands for merging= files > using /etcupdate? Is it in the vi man page? I couldn't find it. > > Thanks for writing! > > bob prohaska > > It's been a while for me so I forget if etcupdate resolve is automatic or there is a prompt or message about it, but the guide at https://docs.freebsd.org/en/books/handbook/cutting-edge/#updating-src-compl= eting-merge-etcupdate says: If etcupdate(8) is not able to merge a file automatically, the merge conflicts can be resolved with manual interaction by issuing: # etcupdate resolve But this info is far below the steps at https://docs.freebsd.org/en/books/handbook/cutting-edge/#updating-src-quick= -start with section 25.6.6.1 also not being mentioned in the steps. Info on merge commands, regardless, is under the Resolve Mode description in the etcupdate man page https://man.freebsd.org/cgi/man.cgi?etcupdate.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CALT2f4tqdJphqm5xUW5bE3V=FAv53WUfXT3tG2eZSoz3EQJjAg>