Jay Hart(jh...@kevla.org) on 2019.07.06 08:57:49 -0400: > > On Sat, Jul 06, 2019 at 11:56:32AM BST, Jay Hart wrote: > >> Good Morning, > >> > >> What is the simple way to have sysmerge "keep" all custom changes to the > >> config files, during a > >> system update from one stable release to the next? I seem to struggle with > >> this every release... > >> > >> Thanks for your time. > >> > >> Jay > >> > > > > Hi Jay, > > > > $ man 8 sysmerge > > [...] > > FILES > > /etc/sysmerge.ignore Files and directories to ignore from > > comparison. > > [...] > > > > Is this what you have in mind? > > > > Regards, > > > > Raf > > > > > > I think its more like when diff asks to keep current config vs new config. I > want to keep my > current config files (or at least those custom portions).
But your current config may be incompatible with the new code. However, sysmerge offers you an option that gets you there halfway: the sdiff(1) merge feature. It it a bit awkward to use if you have the original and your own changes mixed, so here is a trick to help you with the merge: Put as many of your local changes at the bottom of the file, or at least in one large chunk, and leave as much of the original file untouched. For example with sshd_config, all options are commented out. So put your local changes at the bottom of the file. The next time sshd_config changes, your merge will be a lot easier. /B