From owner-freebsd-hackers  Tue Jun 19  2:59:31 2001
Delivered-To: freebsd-hackers@freebsd.org
Received: from l04.research.kpn.com (l04.research.kpn.com [139.63.192.204])
	by hub.freebsd.org (Postfix) with ESMTP id 3BC9337B401
	for <freebsd-hackers@freebsd.org>; Tue, 19 Jun 2001 02:59:28 -0700 (PDT)
	(envelope-from K.J.Koster@kpn.com)
Received: by l04.research.kpn.com with Internet Mail Service (5.5.2653.19)
	id <LN2LAZR5>; Tue, 19 Jun 2001 11:59:26 +0100
Message-ID: <59063B5B4D98D311BC0D0001FA7E452205FD9CC2@l04.research.kpn.com>
From: "Koster, K.J." <K.J.Koster@kpn.com>
To: 'James Halstead' <James_Bond_79@yahoo.com>
Cc: 'FreeBSD Hackers mailing list' <freebsd-hackers@freebsd.org>
Subject: RE: Mergemaster killed symlink (was RE: Mergemaster bug + new fea
	ture [patch])
Date: Tue, 19 Jun 2001 11:59:21 +0100
MIME-Version: 1.0
X-Mailer: Internet Mail Service (5.5.2653.19)
Content-Type: text/plain;
	charset="iso-8859-1"
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

Dear James,

>
> > 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?
>
Well, now that you mention it I think that I just blew away /home/root/ppp
since the box was not going to dial out anymore. Best not have passwords
lying around for no reason. :) Glad you could reproduce it.

Should I submit a PR or is this a "doctor, it hurts when I press
here"--thing?

    Kees Jan

================================================
 You are only young once,
       but you can stay immature all your life.

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