Re: UNS: Re: pkgbase and config file merges

2024-03-07 Thread Baptiste Daroussin
Le 7 mars 2024 20:57:02 GMT+01:00, Garrett Wollman a écrit : >< >said: > >> Pkgbase behave exactly the same as etcupdate and or freebsd-update, >> this is what I am saying > >What's the pkgbase equivalent to `etcupdate resolve`? > >-GAWollman > There is none yet, Bapt

UNS: Re: pkgbase and config file merges

2024-03-07 Thread Garrett Wollman
< said: > Pkgbase behave exactly the same as etcupdate and or freebsd-update, > this is what I am saying What's the pkgbase equivalent to `etcupdate resolve`? -GAWollman

Re: pkgbase and config file merges

2024-03-06 Thread Baptiste Daroussin
Le 6 mars 2024 23:09:07 GMT+01:00, Roger Marquis a écrit : >On Wed, 6 Mar 2024, Baptiste Daroussin wrote: >> .pkgsave once you have boostrapped you should not have any. > >Bootstrapped what though? Whether pkgbase had been previously installed >is not the issue as we expect some pkgbase installs

Re: pkgbase and config file merges

2024-03-06 Thread Roger Marquis
On Wed, 6 Mar 2024, Baptiste Daroussin wrote: .pkgsave once you have boostrapped you should not have any. Bootstrapped what though? Whether pkgbase had been previously installed is not the issue as we expect some pkgbase installs will be to existing systems, with existing configurations. Thes

Re: pkgbase and config file merges

2024-03-06 Thread Mark Millard
On Mar 6, 2024, at 10:12, Baptiste Daroussin wrote: > > Le 6 mars 2024 19:07:51 GMT+01:00, Mark Millard a écrit : >> Baptiste Daroussin wrote on >> Date: Wed, 06 Mar 2024 17:24:18 UTC : >> >>> On Wed, Mar 06, 2024 at 08:59:36AM -0800, Roger Marquis wrote: Automatically overwriting files l

Re: pkgbase and config file merges

2024-03-06 Thread Baptiste Daroussin
Le 6 mars 2024 19:07:51 GMT+01:00, Mark Millard a écrit : >Baptiste Daroussin wrote on >Date: Wed, 06 Mar 2024 17:24:18 UTC : > >> On Wed, Mar 06, 2024 at 08:59:36AM -0800, Roger Marquis wrote: >> > Automatically overwriting files like passwd is clearly a problem. >> > Preferred solution would be

Re: pkgbase and config file merges

2024-03-06 Thread Mark Millard
Baptiste Daroussin wrote on Date: Wed, 06 Mar 2024 17:24:18 UTC : > On Wed, Mar 06, 2024 at 08:59:36AM -0800, Roger Marquis wrote: > > Automatically overwriting files like passwd is clearly a problem. > > Preferred solution would be a list, say [never_overwrite] and/or [ask > > before overwriting

Re: pkgbase and config file merges

2024-03-06 Thread Baptiste Daroussin
On Wed, Mar 06, 2024 at 08:59:36AM -0800, Roger Marquis wrote: > Automatically overwriting files like passwd is clearly a problem. > Preferred solution would be a list, say [never_overwrite] and/or [ask > before overwriting] and/or [write diff to /var/db/pkgbase/...] in > /etc/defaults/pkgbase spec

Re: pkgbase and config file merges

2024-03-06 Thread Roger Marquis
Automatically overwriting files like passwd is clearly a problem. Preferred solution would be a list, say [never_overwrite] and/or [ask before overwriting] and/or [write diff to /var/db/pkgbase/...] in /etc/defaults/pkgbase specifying existing files that should never be modified without at least a

Re: pkgbase and config file merges

2024-03-06 Thread Baptiste Daroussin
On Tue, Mar 05, 2024 at 06:02:41AM +, Graham Perrin wrote: > On 04/03/2024 10:14, Baptiste Daroussin wrote: > > > … > > Pkg has 3-way merge code, so it is similar to etcupdate(8) provided the > > file is > > properly marked as a config file i the source tree which is the case of > > master.pas

Re: pkgbase and config file merges

2024-03-04 Thread Graham Perrin
On 04/03/2024 10:14, Baptiste Daroussin wrote: … Pkg has 3-way merge code, so it is similar to etcupdate(8) provided the file is properly marked as a config file i the source tree which is the case of master.passwd Best regards, Bapt Thanks, that's a very pleasant surprise, is

Re: pkgbase and config file merges

2024-03-04 Thread Baptiste Daroussin
On Sat, Mar 02, 2024 at 04:43:28AM +, Lexi Winter wrote: > hello, > > could someone briefly explain how pkgbase handles merging of > configuration files, for example /etc/master.passwd? does pkg have a > built-in 3-way-merge system similar to etcupdate(8) to handle this, or > is it done anoth

pkgbase and config file merges

2024-03-01 Thread Lexi Winter
hello, could someone briefly explain how pkgbase handles merging of configuration files, for example /etc/master.passwd? does pkg have a built-in 3-way-merge system similar to etcupdate(8) to handle this, or is it done another way? thanks, lexi. signature.asc Description: PGP signature