From owner-freebsd-stable  Sun Apr 14 20:13:43 2002
Delivered-To: freebsd-stable@freebsd.org
Received: from smak.floondoon.com (12-235-41-54.client.attbi.com [12.235.41.54])
	by hub.freebsd.org (Postfix) with ESMTP id 6EA0737B400
	for <freebsd-stable@FreeBSD.ORG>; Sun, 14 Apr 2002 20:13:33 -0700 (PDT)
Received: from sphynx (sphynx.floondoon.com. [192.168.235.15])
	by smak.floondoon.com (8.11.6/8.11.6) with SMTP id g3F2stV00872;
	Sun, 14 Apr 2002 19:54:56 -0700 (PDT)
	(envelope-from james@floondoon.com)
Message-ID: <000f01c1e42b$80d93610$0feba8c0@sphynx>
From: "James Satterfield" <james@floondoon.com>
To: "Michael Ross" <satare@optusnet.com.au>,
	"Kent Stewart" <kstewart@owt.com>
Cc: <freebsd-stable@FreeBSD.ORG>
References: <200204150304.g3F348t25683@mail024.syd.optusnet.com.au>
Subject: Re: Re: mergemaster has locked me out
Date: Sun, 14 Apr 2002 20:13:22 -0700
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.2600.0000
X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2600.0000
Sender: owner-freebsd-stable@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-stable.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-stable>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-stable>
X-Loop: FreeBSD.ORG

Yes, there is a way... PAY ATTENTION when you merge stuff.

James.

----- Original Message -----
From: "Michael Ross" <satare@optusnet.com.au>
To: "Kent Stewart" <kstewart@owt.com>
Cc: <freebsd-stable@FreeBSD.ORG>
Sent: Sunday, April 14, 2002 8:04 PM
Subject: Re: Re: mergemaster has locked me out


> > Kent Stewart <kstewart@owt.com> wrote:
>
> > > I'm guessing my only recourse is to boot as single user and reset,
> > > but how to avoid this kind of nastiness?
> >
> >
> > I would try nothing and if that doesn't work, reboot to single user
> > mode.
>
> apologies for this being  a "me too" email,
>
> but I had the similar problem with my first buildworld, I luckily figured
out
> what happened before I closed my last root shell, so was able to salvage
> the problem easily.
>
> Is there an easy way to just get mergemaster to update the new users
> in your /etc/passwd files while leaving your existing ones alone?
>
> thanks
>
> Michael Ross
> satare@optusnet.com.au
>
> To Unsubscribe: send mail to majordomo@FreeBSD.org
> with "unsubscribe freebsd-stable" in the body of the message


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