From owner-freebsd-stable@FreeBSD.ORG Wed Nov 5 18:58:35 2014 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3505ABD7 for ; Wed, 5 Nov 2014 18:58:35 +0000 (UTC) Received: from system.jails.se (unknown [IPv6:2001:16d8:cc1e:1::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C604C8C7 for ; Wed, 5 Nov 2014 18:58:34 +0000 (UTC) Received: from localhost (system.jails.se [91.205.63.85]) by system.jails.se (Postfix) with SMTP id B39261B5B67 for ; Wed, 5 Nov 2014 19:58:29 +0100 (CET) Received: from [10.28.15.177] (c-5eeaaa5b-74736162.cust.telenor.se [94.234.170.91]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by system.jails.se (Postfix) with ESMTPSA id D10071B5B62; Wed, 5 Nov 2014 19:58:28 +0100 (CET) Content-Type: multipart/signed; boundary=Apple-Mail-90C9C476-989B-4838-892D-E86452C1FB3C; protocol="application/pkcs7-signature"; micalg=sha1 Mime-Version: 1.0 (1.0) Subject: Re: freebsd-udapte upgrade. From: =?utf-8?Q?Peter_Ankerst=C3=A5l?= X-Mailer: iPhone Mail (12B411) In-Reply-To: Date: Wed, 5 Nov 2014 19:58:29 +0100 Content-Transfer-Encoding: 7bit Message-Id: References: <545A348A.4000908@pean.org> To: Scot Hetzel X-DSPAM-Result: Innocent X-DSPAM-Processed: Wed Nov 5 19:58:29 2014 X-DSPAM-Confidence: 1.0000 X-DSPAM-Probability: 0.0023 X-DSPAM-Signature: 545a735564468141515430 X-DSPAM-Factors: 27, manually+#+>>+look, 0.40000, current+#+and, 0.40000, it+#+#+#+contents, 0.40000, Scot+Hetzel+#+gmail+com>, 0.40000, Most+#+what+happened+is, 0.40000, only+I, 0.40000, wrote+#+#+On+Wed, 0.40000, Mime-Version*(1.0), 0.40000, AM+Peter, 0.40000, be+#+that+#+should, 0.40000, upgrade+#+>>, 0.40000, the+#+#+your+current, 0.40000, update+upgrade+#+>>, 0.40000, pean+org>+wrote+#+Could, 0.40000, right, 0.40000, 8+#+#+Peter+Ankerst%c3%a5l, 0.40000, >+>>+#+Wed+Nov, 0.40000, explain+how+to+#+freebsd, 0.40000, seem+to+#+#+about, 0.40000, had+#+to+#+q, 0.40000, of+the+files+has, 0.40000, >>+Could, 0.40000, it+#+have+left+your, 0.40000, can't+#+right+that, 0.40000, your+existing+configuration+#+If, 0.40000, stuck+#+#+#+>, 0.40000, Notice+#+a+#+of, 0.40000 Cc: FreeBSD Stable X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Nov 2014 18:58:35 -0000 --Apple-Mail-90C9C476-989B-4838-892D-E86452C1FB3C Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable > On 5 nov 2014, at 19:53, Scot Hetzel wrote: >=20 >> On Wed, Nov 5, 2014 at 8:30 AM, Peter Ankerst=C3=A5l wro= te: >> Could someone please explain how to use freebsd-update upgrade without >> destroying all of your configuration files? >>=20 >> 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 a= nd >> 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.=20= --Apple-Mail-90C9C476-989B-4838-892D-E86452C1FB3C Content-Type: application/pkcs7-signature; name=smime.p7s Content-Disposition: attachment; filename=smime.p7s Content-Transfer-Encoding: base64 MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIGNzCCBjMw ggUboAMCAQICAwiyiDANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMCSUwxFjAUBgNVBAoTDVN0 YXJ0Q29tIEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRlIFNpZ25pbmcx ODA2BgNVBAMTL1N0YXJ0Q29tIENsYXNzIDEgUHJpbWFyeSBJbnRlcm1lZGlhdGUgQ2xpZW50IENB MB4XDTE0MDEyMDA3NTIzOFoXDTE1MDEyMTA4NTkyMVowUzEZMBcGA1UEDRMQMWlGRkxHbTV3RmVT WjZ6OTEXMBUGA1UEAwwOcGV0ZXJAcGVhbi5vcmcxHTAbBgkqhkiG9w0BCQEWDnBldGVyQHBlYW4u b3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzoKHiOE9vdQgax/GZyTaqtNvfjGI HwG1tsMOXZELs49KJY66oD//szW3yoIl8nQapUBn+hZqs3QT5PxqfElXxljYszYE6yk3kWR7EVtl IEfT7Pf24XlFw4uzoZzEjaxPJBt4+BWwb1MpqBmwTNZwZGYI9SO6JW23G9o+e+hPmlXFTovW9B36 J0M2Qu0+IE6MsDIG0y5CwuiXMqNz+vEBiIBvdef3CIidRn3/K7DQYBYn9gj/UNB1yf1GRhsNDO12 4T9+9bhlplov0srt7pqQjaSiiqVOCCWdpxvM/eF0LFBkEFATy45RKtl2vk9zM1wmI+sU29vodHoD Duf8t4bTtQIDAQABo4IC1DCCAtAwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0lBBYwFAYI KwYBBQUHAwIGCCsGAQUFBwMEMB0GA1UdDgQWBBSAhVDjVwheLV39/7XFsz9rQP0sVDAfBgNVHSME GDAWgBRTcu2SnODaywFcfH6WNU7y1LhRgjAZBgNVHREEEjAQgQ5wZXRlckBwZWFuLm9yZzCCAUwG A1UdIASCAUMwggE/MIIBOwYLKwYBBAGBtTcBAgMwggEqMC4GCCsGAQUFBwIBFiJodHRwOi8vd3d3 LnN0YXJ0c3NsLmNvbS9wb2xpY3kucGRmMIH3BggrBgEFBQcCAjCB6jAnFiBTdGFydENvbSBDZXJ0 aWZpY2F0aW9uIEF1dGhvcml0eTADAgEBGoG+VGhpcyBjZXJ0aWZpY2F0ZSB3YXMgaXNzdWVkIGFj Y29yZGluZyB0byB0aGUgQ2xhc3MgMSBWYWxpZGF0aW9uIHJlcXVpcmVtZW50cyBvZiB0aGUgU3Rh cnRDb20gQ0EgcG9saWN5LCByZWxpYW5jZSBvbmx5IGZvciB0aGUgaW50ZW5kZWQgcHVycG9zZSBp biBjb21wbGlhbmNlIG9mIHRoZSByZWx5aW5nIHBhcnR5IG9ibGlnYXRpb25zLjA2BgNVHR8ELzAt MCugKaAnhiVodHRwOi8vY3JsLnN0YXJ0c3NsLmNvbS9jcnR1MS1jcmwuY3JsMIGOBggrBgEFBQcB AQSBgTB/MDkGCCsGAQUFBzABhi1odHRwOi8vb2NzcC5zdGFydHNzbC5jb20vc3ViL2NsYXNzMS9j bGllbnQvY2EwQgYIKwYBBQUHMAKGNmh0dHA6Ly9haWEuc3RhcnRzc2wuY29tL2NlcnRzL3N1Yi5j bGFzczEuY2xpZW50LmNhLmNydDAjBgNVHRIEHDAahhhodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS8w DQYJKoZIhvcNAQEFBQADggEBAFiVjpZEkQoHYAtb0E6MVJgzo1K6d6eEjLsCNbaw833a0jws4Rh0 KG/MjqjJzUwa2G6mVZb/JaodRK8VENnpxJ8WhjWqyQL8/lKnGa88XYMtl+i4ICur08IfQLG7zNFn yG/kOAiMNkgF4H6lZx/ezup9fowUOt0hxERXMcqo4p+RzPShx35EGRv+5gZNQ7XW4s2rzFzt9CHa Dar8SyAGHK3oFapKpHsVSUYik0QCLwnGcaHEHNUkCp1YMsjKwvmxVtQQs/2WfsqQlult8UYe0bTr nwDyLbgJDbvp9R5mZDrkUcXYlgP+mAmzTOrT1JhHbyYQjbbxJAmqkAIDcwVyDRAxggNvMIIDawIB ATCBlDCBjDELMAkGA1UEBhMCSUwxFjAUBgNVBAoTDVN0YXJ0Q29tIEx0ZC4xKzApBgNVBAsTIlNl Y3VyZSBEaWdpdGFsIENlcnRpZmljYXRlIFNpZ25pbmcxODA2BgNVBAMTL1N0YXJ0Q29tIENsYXNz IDEgUHJpbWFyeSBJbnRlcm1lZGlhdGUgQ2xpZW50IENBAgMIsogwCQYFKw4DAhoFAKCCAa8wGAYJ KoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMTQxMTA1MTg1ODI5WjAjBgkq hkiG9w0BCQQxFgQUbmPIJs1tOgs6o8cDu97KBzVNvZMwgaUGCSsGAQQBgjcQBDGBlzCBlDCBjDEL MAkGA1UEBhMCSUwxFjAUBgNVBAoTDVN0YXJ0Q29tIEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBEaWdp dGFsIENlcnRpZmljYXRlIFNpZ25pbmcxODA2BgNVBAMTL1N0YXJ0Q29tIENsYXNzIDEgUHJpbWFy eSBJbnRlcm1lZGlhdGUgQ2xpZW50IENBAgMIsogwgacGCyqGSIb3DQEJEAILMYGXoIGUMIGMMQsw CQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0 YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3MgMSBQcmltYXJ5 IEludGVybWVkaWF0ZSBDbGllbnQgQ0ECAwiyiDANBgkqhkiG9w0BAQEFAASCAQBpon0Y14AjfJss edjVc06PxMHyq/v0FrMqAiUc2xfv8iG5F+4BlBXwhLcYFsv3HnYGQv88gpBUdeEsyKWWr6LoNxvD 7qnLr5kkxs2QYUfnMxm1ptXkTwwGyLPDRcpUEcLU89T3u9niY7K1ARjHY9O+Xv6IAmc06SXJttk6 qXglR+yK7vn21gHvLc6NGMuGjIbpV3bg2zzH5mpgJFCB0x8JL10Pe/qag0oK+o9yUrOG4geVh+cQ QQ/q5cCwKLE7N60rz70fWfyrBatQHXyTjiTqEWxA/C9zZrP9Wnx7WfppeeEC5K4AemQaskh/+lYk /9yATz+WnHVukebH4mI/2aO0AAAAAAAA --Apple-Mail-90C9C476-989B-4838-892D-E86452C1FB3C--