From owner-freebsd-questions@FreeBSD.ORG Sun Apr 6 07:03:30 2003 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 98C7237B401 for ; Sun, 6 Apr 2003 07:03:30 -0700 (PDT) Received: from tomts14-srv.bellnexxia.net (tomts14.bellnexxia.net [209.226.175.35]) by mx1.FreeBSD.org (Postfix) with ESMTP id 733BE43FBD for ; Sun, 6 Apr 2003 07:03:29 -0700 (PDT) (envelope-from matt@gsicomp.on.ca) Received: from gabby.gsicomp.on.ca ([65.95.176.5]) by tomts14-srv.bellnexxia.netESMTP <20030406140328.OVHC2534.tomts14-srv.bellnexxia.net@gabby.gsicomp.on.ca>; Sun, 6 Apr 2003 10:03:28 -0400 Received: from hermes (hermes.gsicomp.on.ca [192.168.0.18]) by gabby.gsicomp.on.ca (8.12.6/8.12.6) with SMTP id h36E0PiG061597; Sun, 6 Apr 2003 10:00:26 -0400 (EDT) (envelope-from matt@gsicomp.on.ca) Message-ID: <00c501c2fc45$42c2f090$1200a8c0@gsicomp.on.ca> From: "Matthew Emmerton" To: , "Giorgos Keramidas" References: <1049333119.3e8b8d7f0c73b@webmail.adam.com.au><1049432553.3e8d11e923925@webmail.adam.com.au> <20030404113740.T20523@gothmog><1049529621.3e8e8d153e24f@webmail.adam.com.au><20030405221114.GA2419@gothmog.gr> <1049637546.3e9032aae7488@webmail.adam.com.au> Date: Sun, 6 Apr 2003 10:03:12 -0400 MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 6.00.2800.1106 X-MIMEOLE: Produced By Microsoft MimeOLE V6.00.2800.1106 cc: freebsd-questions@freebsd.org Subject: Re: sendmail woes X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Apr 2003 14:03:30 -0000 > Quoting Giorgos Keramidas : > > > I'd probably boot single user mode and run 'mergemaster' after mounting > > all the filesystems. > > Giorgios, > Am I expecting too much of mergemaster? > I took your advice and ran it without any options. > It showed me the comparision between old and new files as it ran on the > console, and stored the new files in /var/tmp/temproot for me to compare and > adjust my old files - without any guide about what the differences might be. > The "old" files remain untouched until I manually change them. > Is there at least a log somewhere which highlights any differences so I have > the same sort of guide that appeared on the console when I ran mergemaster? The differences are shown, per file, when you run mergemaster. You can choose "i" (install) to install the new file, which will wipe out any changes you may have made in your "old" version. Of your can choose to "leave until later", and then you will have to diff and merge the changes by hand. (Use the diff command to show the differences, and then edit your "old" files with the changes.) > BTW, the difference between old and new freebsd.mc appears (more-or-less) > cosmetic - BUT I didn't have a freebsd_submit.mc and one or two other files > which look important. If you don't have some of the files which look important, then you should have chosen "i" (install) when mergemaster gave you the choice. For these, just copy them from /var/tmp/temproot into their appropriate place. -- Matt Emmerton