From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists.gentoo.org ([140.105.134.102] helo=robin.gentoo.org) by nuthatch.gentoo.org with esmtp (Exim 4.43) id 1EA7M4-0000Fu-Sz for garchives@archives.gentoo.org; Tue, 30 Aug 2005 14:44:53 +0000 Received: from robin.gentoo.org (localhost [127.0.0.1]) by robin.gentoo.org (8.13.4/8.13.4) with SMTP id j7UEdWRf010401; Tue, 30 Aug 2005 14:39:32 GMT Received: from nproxy.gmail.com (nproxy.gmail.com [64.233.182.193]) by robin.gentoo.org (8.13.4/8.13.4) with ESMTP id j7UETBAA016055 for ; Tue, 30 Aug 2005 14:29:11 GMT Received: by nproxy.gmail.com with SMTP id x37so390075nfc for ; Tue, 30 Aug 2005 07:31:17 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:reply-to:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=Jvu/fdptOFK+jn1LY+vjiJcFt0Cg2moKDOiQhF7E5ybXoAHRtTCpnvLMSMNLhHtV5QiGJvetLUt2svxoiZZQhZzkZbzdZqDTftg6DidTQ2XyN0Msqr5A7UUgiKEuxXRCenVRLUG2MWKnEmn5GtjVrajCfPs/HBhE0T9Ij1wpU0A= Received: by 10.48.157.15 with SMTP id f15mr360178nfe; Tue, 30 Aug 2005 07:31:17 -0700 (PDT) Received: by 10.48.49.13 with HTTP; Tue, 30 Aug 2005 07:31:17 -0700 (PDT) Message-ID: <83e036b0050830073171e3b5f7@mail.gmail.com> Date: Tue, 30 Aug 2005 15:31:17 +0100 From: Roger Light To: gentoo-user@lists.gentoo.org Subject: Re: [gentoo-user] How to work with etc-updates. In-Reply-To: <43146614.6000002@nethere.com> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-user@gentoo.org Reply-to: gentoo-user@lists.gentoo.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Disposition: inline References: <43146614.6000002@nethere.com> Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from quoted-printable to 8bit by robin.gentoo.org id j7UETBAA016055 X-Archives-Salt: 8c2dacee-dcc3-4159-8dc6-96b27b934bce X-Archives-Hash: 9270419a268a1973838a49c65a52a7c5 On 30/08/05, Jerry Turba wrote: > As I understand the process etc-update lists new configuration files > provided by the program authors. I have tried to define some rules for > myself to determine how to handle these new files. > > 1. If I made a change to a file I will never allow the new config file > to overwrite the old file. This isn't really a good idea. There are definitely cases where the new file will provide important updates that you need. Not updating the config file could lead to the associated program no longer working or you missing out on a useful feature. Using etc-update, select the file you have changed and look at the differences. You may see that other than the changes you made, there are only updates to comments within the file. In this case you can of course just ignore the update. If there are real updates and your own update looks as though it is still valid then use the "Interactively merge original with update" option. You can then choose which lines to include in the new file. The left hand side of the diff output is the original file, the right hand side is the new. So for each line presented, apart from for the lines that you have modified, input "r" to choose the right hand side line. For the lines you changed, input "l" to choose your version. Always verify the resulting file with "Show differences between merged file and original" before selecting the "Replace YOUR_FILE with merged file" option. All just my opinion of course... Cheers, Roger -- gentoo-user@gentoo.org mailing list