Date: Wed, 5 Nov 2014 19:58:29 +0100 From: =?utf-8?Q?Peter_Ankerst=C3=A5l?= <peter@pean.org> To: Scot Hetzel <swhetzel@gmail.com> Cc: FreeBSD Stable <freebsd-stable@freebsd.org> Subject: Re: freebsd-udapte upgrade. Message-ID: <BD86DB4D-1718-4E3F-9F4A-6B3531ED8FBA@pean.org> In-Reply-To: <CACdU%2Bf-vY2DL=2mHGgU7Lggv2zxrhTji4Aoddrh3L=TAvOC-OA@mail.gmail.com> References: <545A348A.4000908@pean.org> <CACdU%2Bf-vY2DL=2mHGgU7Lggv2zxrhTji4Aoddrh3L=TAvOC-OA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
> On 5 nov 2014, at 19:53, Scot Hetzel <swhetzel@gmail.com> wrote:
>
>> On Wed, Nov 5, 2014 at 8:30 AM, Peter Ankerstål <peter@pean.org> wrote:
>> Could someone please explain how to use freebsd-update upgrade without
>> destroying all of your configuration files?
>>
>> I really don't understand how to use the merge function.. In this case i
>> typed :q for all files it asked about. :wq seem to
>> do about the same thing. Notice that a few of the files has this shit in
>> multiple places. I can't be right that I should edit every file manually and
>> look for "current version" and so on?
> Most likely what happened is that when you used :wq it wrote the
> contents of the diff between your current version and the new version
> to your existing configuration files. If you had stuck to using :q,
> it should have left your existing configuration files alone.
This was done with :q only. I dont get it.
[-- Attachment #2 --]
0 *H
01 0 + 0 *H
70300
*H
01 0 UIL10U
StartCom Ltd.1+0)U "Secure Digital Certificate Signing1806U/StartCom Class 1 Primary Intermediate Client CA0
140120075238Z
150121085921Z0S10U
1iFFLGm5wFeSZ6z910U peter@pean.org1 0 *H
peter@pean.org0"0
*H
0
= k g$ڪo~1 ] J%?5ʂ%t@gjtj|IWXس6)7d{[e GyEËčO$xoS)Lpdf#%m>{OUN 'C6B> N2.B2souF}+`'PuFF
v?~eZ/N%t,PdPˎQ*vOs3\&#tzӵ 00 U 0 0 U 0 U %0++0 U PW^-]ų?k@,T0 U #0Sr풜\|~5NԸQ0U 0peter@pean.org0LU C0?0; +70*0.+"http://www.startssl.com/policy.pdf0+00' StartCom Certification Authority0This certificate was issued according to the Class 1 Validation requirements of the StartCom CA policy, reliance only for the intended purpose in compliance of the relying party obligations.06U /0-0+)'%http://crl.startssl.com/crtu1-crl.crl0+009+0-http://ocsp.startssl.com/sub/class1/client/ca0B+06http://aia.startssl.com/certs/sub.class1.client.ca.crt0#U 0http://www.startssl.com/0
*H
XD
` [NT3Rw5}<,t(o̎LnU% Dğ5R<]- + @go86H~g }~:!DW1ʨ⟑~DMCͫ\!
K J{IF"D/ q $
X2V~ʐmF Ѵ -
fd:Qؖ LԘGo&$ sr
1o0k001 0 UIL10U
StartCom Ltd.1+0)U "Secure Digital Certificate Signing1806U/StartCom Class 1 Primary Intermediate Client CA0 + 0 *H
1 *H
0 *H
1
141105185829Z0# *H
1nc&m: :5M0 +71001 0 UIL10U
StartCom Ltd.1+0)U "Secure Digital Certificate Signing1806U/StartCom Class 1 Primary Intermediate Client CA0 *H
101 0 UIL10U
StartCom Ltd.1+0)U "Secure Digital Certificate Signing1806U/StartCom Class 1 Primary Intermediate Client CA0
*H
i}׀#|,ysN*% ! vB<Tu,ȥ7˯$͐aG3O ȳETccӾ^g4%ɶ:x%G-ˆWv<j`$P /]{J
rRA(;7+Ͻ YP |$l@/sfZ|{Yiy zdHV$܀O?unb?٣
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?BD86DB4D-1718-4E3F-9F4A-6B3531ED8FBA>