Date: Wed, 14 Dec 2022 16:28:08 +0000 From: bugzilla-noreply@freebsd.org To: bugs@FreeBSD.org Subject: [Bug 185546] freebsd-update(8) can modify sshd and lock you out of your system Message-ID: <bug-185546-227-YnjcEBn5Lo@https.bugs.freebsd.org/bugzilla/> In-Reply-To: <bug-185546-227@https.bugs.freebsd.org/bugzilla/> References: <bug-185546-227@https.bugs.freebsd.org/bugzilla/>
next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D185546 --- Comment #5 from Ed Maste <emaste@freebsd.org> --- As comment #3 points out this conflict should have emitted a message and op= ened an editor; this may not be particularly user-friendly, and also as comment = #3 suggests we ought to check for "<<<<<<<" markers and refuse to continue unt= il they are addressed. That said, this 3-way diff resolution is best addressed by having freebsd-update use a tool (like etcmerge) rather than having built-in logic. --=20 You are receiving this mail because: You are the assignee for the bug.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-185546-227-YnjcEBn5Lo>