diff options
| author | Graham Perrin <grahamperrin@gmail.com> | 2023-08-19 14:52:18 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2024-02-02 20:35:25 +0000 |
| commit | a8c1ffca7a594733a91c1513d0185be174d1115f (patch) | |
| tree | 5b9ea84ca84b515872a0cb5beff4b5e7e8b81964 | |
| parent | d854370fa86b74527e57145955b1fa3ca75643a2 (diff) | |
| download | src-a8c1ffca7a594733a91c1513d0185be174d1115f.tar.gz src-a8c1ffca7a594733a91c1513d0185be174d1115f.zip | |
freebsd-update(8): Explain conflicts in /etc
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
| -rw-r--r-- | usr.sbin/freebsd-update/freebsd-update.8 | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/usr.sbin/freebsd-update/freebsd-update.8 b/usr.sbin/freebsd-update/freebsd-update.8 index 0d50ac8822de..1960b0ee95fe 100644 --- a/usr.sbin/freebsd-update/freebsd-update.8 +++ b/usr.sbin/freebsd-update/freebsd-update.8 @@ -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. |