Date: Wed, 31 May 2023 08:00:21 +0200 From: Alexander Leidinger <Alexander@leidinger.net> To: bob prohaska <fbsd@www.zefox.net> Cc: freebsd-current@freebsd.org Subject: Re: Surprise null root password Message-ID: <20230531080021.Horde.4rhTtWEKR0KOgZ39bqdIoug@webmail.leidinger.net> 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>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --]
Quoting bob prohaska <fbsd@www.zefox.net> (from Tue, 30 May 2023
08:36:21 -0700):
>> I suggest to review changes ("df" instead of "tf" in etcupdate) to at least
>> those files which you know you have modified, including the password/group
>> stuff. After that you can decide if the diff which is shown with "df" can be
>> applied ("tf"), or if you want to keep the old version ("mf"), or if you
>> 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 screen
> were elusive. Probably it was thought self-evident, but not for me.
> I last 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.
etcupdate respects the EDITOR env-variable. You can use any editor you
like there.
Typically I use the mouse to copy&paste myself and google every time I
can't (https://linuxize.com/post/how-to-copy-cut-paste-in-vim/).
Bye,
Alexander.
--
http://www.Leidinger.net Alexander@Leidinger.net: PGP 0x8F31830F9F2772BF
http://www.FreeBSD.org netchild@FreeBSD.org : PGP 0x8F31830F9F2772BF
[-- Attachment #2 --]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIzBAABCAAdFiEER9UlYXp1PSd08nWXEg2wmwP42IYFAmR24nQACgkQEg2wmwP4
2IZwBw/+Pz9Orf5fw8KtgtP/OYf1sDvolMuCao4GHQv4SWy2hbD4OJQGzcIyT+ju
0kWWIB/d1O0ribxhPx2nXOwtlQKhNbaMhFmcG22dKdifaJIL9dW7fMGPOg9UBhe5
LDk+l7ypu3qFRjOHyt+erWHmNpmGCwnxnykeJEfZRjHsGu6WwdX4r9A+GSIIDp+e
Ji2uzsVq/MhbmAYVe3/z5pRc7cBWF+wv4RwN9uPlFJGZe9xPsuPPWBjpG93c/txv
I4XLJ5K3KGtFziY7U3ASX1UIPVdoqsVtpQW3Odnye0JUQRYmDgdtB2gY8UYZYSvq
uyhQIubwkiIxIyg02+5LQHZZEHW5qsp+83sZNEcXEuFCVUAlGdU7woQYeGyyDBHD
98LBaZn7lX1zL8ap99RJIH7q/ftQ/V9vUWHqr+/UTnmHkZnhE0jTCv07yyyf3MXv
41bSeMtqYO+ent/sOjApT22Zw1IwPLTko4x8w5FR7DoqyA94c9i8HLESpximfj9H
YiICt7bOLOqZ2OL0uvRjXELcUpLudJ/2bzQQiy3bEWzRKiXTjXTnvI9IFEda5oRe
UZW7HrkOxqDmYWH1cSYBmkoPDcS2meilC0RVb1uQfbQoIjnmiy/AYtDLQMkpcP9l
vR/Ly2DdOJ0zU0e31lWWhA9UymZtf6+mVOUa7hL/CvkvSmO2e/M=
=tha6
-----END PGP SIGNATURE-----
help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20230531080021.Horde.4rhTtWEKR0KOgZ39bqdIoug>