On Thu, 2 Oct 2025 12:54:55 +0300 Andriy Gapon <[email protected]> wrote:
> On 02/10/2025 12:35, Lexi Winter wrote: > > yes, the merge functionality is the same (more or less), but the result > > for the user is worse: etcupdate makes it clear which files failed to > > merge and offers a manual resolution of the merge with conflict markers, > > while pkg just prints a message, which is usually lost in the hundreds > > of other messages printed during an upgrade, and requires the user to > > manually locate the unmerged files via find / -name '*.pkgnew', then > > you only get the old and new files with no way to easily see what has > > changed in the new version of the file. (basically, this is a manual > > two-way merge.) > > > > if there's a better way to do this with pkg, i'd definitely like to know > > about it. > > It would be good if pkg installed base configuration files into etcupdate's > tree > and then a user needed to explicitly run etcupdate to apply configuration > updates. > > But I imagine that this may not be very easy to do and it would create a > relatively fragile dependency between pkg and etcupdate. > > -- > Andriy Gapon Isn't it better to keep freebsd-update (with modifications) and wrap pkgbase upgrades around? Doing so would allow splitting etcupdate process out from base pkg upgrades, isn't it? -- Tomoaki AOKI <[email protected]>
