Date: Sun, 20 Apr 2003 14:04:16 -0400 From: Bill Moran <wmoran@potentialtech.com> To: Anton Zavrin <antonzav@pacbell.net> Cc: freebsd-stable@freebsd.org Subject: Re: mergemaster tips Message-ID: <3EA2E120.50005@potentialtech.com> In-Reply-To: <003901c30761$b020fd40$0200a8c0@travel> References: <003901c30761$b020fd40$0200a8c0@travel>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3EA2E120.50005>