From owner-freebsd-hackers  Mon Jun 18 17:16:18 2001
Delivered-To: freebsd-hackers@freebsd.org
Received: from mailout2-0.nyroc.rr.com (mailout2-0.nyroc.rr.com [24.92.226.121])
	by hub.freebsd.org (Postfix) with ESMTP id 895F237B406
	for <freebsd-hackers@freebsd.org>; Mon, 18 Jun 2001 17:16:14 -0700 (PDT)
	(envelope-from James_Bond_79@yahoo.com)
Received: from Halstead007 (roc-24-169-196-57.rochester.rr.com [24.169.196.57])
	by mailout2-0.nyroc.rr.com (8.11.2/RoadRunner 1.03) with SMTP id f5J0EjW03938;
	Mon, 18 Jun 2001 20:14:46 -0400 (EDT)
Content-Type: text/plain;
  charset="iso-8859-1"
From: James Halstead <James_Bond_79@yahoo.com>
To: "Koster, K.J." <K.J.Koster@kpn.com>
Subject: Mergemaster killed symlink (was RE: Mergemaster bug + new feature [patch])
Date: Tue, 19 Jun 2001 00:21:53 +0000
X-Mailer: KMail [version 1.2]
Cc: "'FreeBSD Hackers mailing list'" <freebsd-hackers@freebsd.org>
References: <59063B5B4D98D311BC0D0001FA7E452205FD9CBF@l04.research.kpn.com>
In-Reply-To: <59063B5B4D98D311BC0D0001FA7E452205FD9CBF@l04.research.kpn.com>
MIME-Version: 1.0
Message-Id: <01061900215303.13565@Halstead007>
Content-Transfer-Encoding: 8bit
Sender: owner-freebsd-hackers@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-hackers.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo?subject=subscribe%20freebsd-hackers>
List-Unsubscribe: <mailto:majordomo?subject=unsubscribe%20freebsd-hackers>
X-Loop: FreeBSD.ORG

On Monday 18 June 2001 17:04, Koster, K.J. wrote:
> I had a mergemaster problem a while back, but I haven't debugged it
> properly. I had my /etc/ppp symlinked into /home/root/ppp. Then, after a
> mergemaster run I ended up with a file named /etc/ppp, which had the
> contents of the new version of /etc/ppp/ppp.conf.

I symlinked /etc/ppp to /usr/ppp and mergemaster updated fine. I then removed 
/usr/ppp making the symlink invalid and mergemaster overwrote the bad symlink 
with ppp.conf. Is there any chance when you ran mergemaster that one time 
your /home was not mounted?

I haven't gone as far as to find just what the offending area of mergemaster 
is.

>
>     Kees Jan
>
> PS. I initially read the subject line as "mergemaster has one fewer bug and
> one newly discovered feature". :)

;P

James

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-hackers" in the body of the message