Date: Wed, 28 Jan 2015 07:15:52 +0000 From: Matthew Seaman <m.seaman@infracaninophile.co.uk> To: Andrew Gould <andrewlylegould@gmail.com>, "Brian W." <brian@brianwhalen.net> Cc: FreeBSD Mailing List <freebsd-questions@freebsd.org> Subject: Re: freebsd-update questions Message-ID: <54C88CA8.7010808@infracaninophile.co.uk> In-Reply-To: <CAFKhKgoR5wv2Fvv6P6NKCNBjVUQwQ304iQ%2BR3gSj2qCW4FYgzg@mail.gmail.com> References: <CAFKhKgqaHbzWRpxBginmH91s2YVgtzZZsAdHX2T_5OjdnQ1Qag@mail.gmail.com> <54B37A5F.5050302@infracaninophile.co.uk> <CAFKhKgpEsKLBRh8zqPyTJOCPbeM7wJrpPHKOSL2Bw7mBqTR4%2BQ@mail.gmail.com> <CADV=szU%2B2-yhe5skeDHtPNUrxzNKcJsMW=GjMLCha5xBJYnUiA@mail.gmail.com> <CAFKhKgoR5wv2Fvv6P6NKCNBjVUQwQ304iQ%2BR3gSj2qCW4FYgzg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --GUG8l7kPstdPnwpuGQGRfSoUWlkFqHcxW Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 2015/01/28 02:50, Andrew Gould wrote: > On Mon, Jan 12, 2015 at 12:46 PM, Brian W. <brian@brianwhalen.net> wrot= e: >=20 >> A key thing to watch for in the conf files is that markers will be put= in >> place so you can see what's new; those need to be deleted. >> > When I attempted an upgrade to 10.1-RELEASE, I got a message that certa= in > configuration files couldn't be merged and that I should hit the enter > button to merge them manually in vi. >=20 > In vi, the first line was a series of left pointing arrows and a refere= nce > to version 10.0. That was followed by the content of the new > configuration file. (I think it was new because the lines I added to th= e > existing files weren't there.) >=20 > The last line was a series of right pointing errors and a reference to > version 10.1. >=20 > What am I supposed to do to keep the old configuration file contents? > There are no instructions. This is freebsd-update asking you to resolve conflicts in a three-way merge between the file as supplied with the old version of FreeBSD, the equivalent in the new version, and the file that is actually present on your system. The >>>>>>>>, =3D=3D=3D=3D=3D=3D=3D=3D=3D and <<<<<<<< mark= ers are a standard convention for indicating where there were areas of the file that were changed differently between old --> new and old --> what's on your system: what is generally called a 'merge conflict.' Edit the file so it has the contents you want. The sections indicated by >>>>>>> etc markers are usually smaller than the whole file. It's important to remove all the markers in those files, or various things may not start up correctly when you reboot. Cheers, Matthew --GUG8l7kPstdPnwpuGQGRfSoUWlkFqHcxW Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.22 (Darwin) Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJUyIy2AAoJEABRPxDgqeTnhHkP/jfoUeF1e8oB19ixNQ7hJF7p A31DAPTTR+B0Amd5LkZfVzhgHLGH2ImoEIEiLDz+xgrh2G+IZ4D6a7XcwqQ1MReu 94oud5vH8eCbISJbATorHOAjtD/SshMUSkq0I/KZbwML6FH2XJTyU66p53AQYMbl erlUFStQu2pdnbihgqL+3K0xW0aTO8gxlbvoLQFW1YrdpH+8hROrwgInCAglylOO bUR7ESPiLRLDTg0IRcVVTQkEG++EeZZesiT4vGsLI3OyQBMBMT6tAul8vnZOPIWz ljbUFctMz4D/1qXCJUfdb1ip0pr8aNoVd1YxgUMAA3Aa51h6gG7N7BsV68mQ4iuR 4tbiAFNcpylAXJr6NKZFUtJGdpSX+fcdEHADNA8f0s4lbvy6cgzSKHLUomB+O5Ia A0agle8wtJC0vyhoeUr7B9eXnAYw0Jm2IsR8gF7QE+spSRIVuE/nmS8bki8YQdht zNE/ly2oeOcybtzT+Rdc+zHJ+1ga1JHi0AIRE7WpiTF8wc4OrThSzDY72pxIG5zb SxFg/c/EezYuCBDJe2F++bvMQzhHQVcNRoEGY+or3SHtfvJT4IXLFm8sg4NHBGk+ VUKJqpk8fvbS3R00NZGGCElP1RpH6uU+rmiEQDx8b7b9l+1YbqiF0k7g8YzUmkNw n/nXQI4JqyFSE2e9n4eP =gIqc -----END PGP SIGNATURE----- --GUG8l7kPstdPnwpuGQGRfSoUWlkFqHcxW--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?54C88CA8.7010808>