Date: Wed, 16 Nov 2016 06:24:54 -0800 From: Chris Stankevitz <chris@stankevitz.com> To: Jonathan Moore <jdm7dv@outlook.com>, "freebsd-questions@freebsd.org" <freebsd-questions@freebsd.org> Subject: Re: Building world vs freebsd-update: merging files Message-ID: <7955a263-ea42-e1bd-6813-7ba740ca7bee@stankevitz.com> In-Reply-To: <MWHPR02MB2479A5B50FCA60F387EDC6489ABE0@MWHPR02MB2479.namprd02.prod.outlook.com> References: <MWHPR02MB2479A5B50FCA60F387EDC6489ABE0@MWHPR02MB2479.namprd02.prod.outlook.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On 11/16/16 6:09 AM, Jonathan Moore wrote: > Because merge master merges your confg files and update does not. > > Here is a quick and dirty build world > > http://hades.palmboys.nl/freebsd-updating.html > > Jonathan Moore According to the handbook [1], freebsd-update does indeed merge configuration files: Confusingly the handbook explicitly says that mergemaster is not used but refers to mergemaster documentation for more info. Chris [1] From https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/updating-upgrading-freebsdupdate.html: The file merge process is a series of diff(1) patches similar to mergemaster(8), but with fewer options. Merges are either accepted, open an editor, or cause freebsd-update to abort. When in doubt, backup /etc and just accept the merges. See Section 23.6.4, “Merging Configuration Files” for more information about mergemaster.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?7955a263-ea42-e1bd-6813-7ba740ca7bee>