system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-06 17:18:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

freebsd-update(8): Explain conflicts in /etc

Browse source 
Unlike etcupdate(8), freebsd-update only prints the files with
conflicts. It doesn't merge.

PR: 204549
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/826
This commit is contained in:
Graham Perrin 2023-08-19 15:52:18 +01:00 committed by Warner Losh
parent d854370fa8
commit a8c1ffca7a
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
usr.sbin/freebsd-update/freebsd-update.8
View file

@ -264,3 +264,12 @@ required.
.Xr nextboot 8
.Sh AUTHORS
.An Colin Percival Aq Mt cperciva@FreeBSD.org
.Sh BUGS
In patch level situations – for example, 13.2-RELEASE-p1 up to 13.2-RELEASE-p2: if any previous modification to a file in
.Pa /etc/
will conflict with an available update, then
.Nm
will make no attempt to merge.
Instead:
.Nm
will print a list of affected locally-modified files.