From owner-freebsd-stable@FreeBSD.ORG Sun Apr 20 11:04:18 2003 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7478637B401 for ; Sun, 20 Apr 2003 11:04:18 -0700 (PDT) Received: from pa-plum1b-166.pit.adelphia.net (pa-plum1b-122.pit.adelphia.net [24.53.161.122]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9B07443F75 for ; Sun, 20 Apr 2003 11:04:17 -0700 (PDT) (envelope-from wmoran@potentialtech.com) Received: from potentialtech.com (working [172.16.0.95]) h3KI4Gwl001661; Sun, 20 Apr 2003 14:04:16 -0400 (EDT) (envelope-from wmoran@potentialtech.com) Message-ID: <3EA2E120.50005@potentialtech.com> Date: Sun, 20 Apr 2003 14:04:16 -0400 From: Bill Moran User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.2.1) Gecko/20030301 X-Accept-Language: en-us, en MIME-Version: 1.0 To: Anton Zavrin References: <003901c30761$b020fd40$0200a8c0@travel> In-Reply-To: <003901c30761$b020fd40$0200a8c0@travel> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit cc: freebsd-stable@freebsd.org Subject: Re: mergemaster tips X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.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: Sun, 20 Apr 2003 18:04:18 -0000 Anton Zavrin wrote: > Hi, give me some tips please, first of all, first screen: > ============================================= > *** The directory specified for the temporary root environment, > /var/tmp/temproot, exists. This can be a security risk if untrusted > users have access to the system. > > Use 'd' to delete the old /var/tmp/temproot and continue > Use 't' to select a new temporary root directory > Use 'e' to exit mergemaster > > Default is to use /var/tmp/temproot as is > > How should I deal with this? [Use the existing /var/tmp/temproot] > ============================================== > Should I "d" the old temproot or should I just hit "Enter"? Depends on how you got here. I'm assuming that the last time you did mergemaster you didn't delete /var/tmp/temproot when you were done. If that is the case, you're probably safest to delete it now, before continuing. If you're not sure, I would recommend "mv /var/tmp/temproot /var/tmp/temproot.old" and then run mergemaster. If everything works OK, you should delete /var/tmp/temproot.old. > Second thing, when I actually merging files, what I do is I hit "v" - > variously include common lines and then I hit "m" to merge, primarily > using "r" right side. > By "verbosely include common lines" I only "Guess" that the mergemaster > will include everything common from both files and then by using "r" > switch I'm adding everything "fresh" from the new files (the files I > just cvsuped), then I hit "q" to get out and then I hit "i" to install > merged file. > I do not need to edit any of my files during update, I just need to save > what I have and add enw stuff. > > If you see my logic, please let me know if it's correct. First: Always backup /etc before running mergemaster Second: Each file is different. If you're sure you've never altered the file in question, just install the new one (/etc/defaults should be like this, for example) If you've changed the file you can either keep the old one (/etc/printcap is an example of a file that I usually keep the old version) or merge. I'm not 100% sure I understand the way you describe, but if you back up /etc before starting (I just 'cp -Rp /etc /etc.old') you can always back out of a mistake. -- Bill Moran Potential Technologies http://www.potentialtech.com