From owner-freebsd-stable@FreeBSD.ORG  Mon Jan 28 01:10:55 2013
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id BE614B0B
 for <freebsd-stable@freebsd.org>; Mon, 28 Jan 2013 01:10:55 +0000 (UTC)
 (envelope-from kob6558@gmail.com)
Received: from mail-da0-f48.google.com (mail-da0-f48.google.com
 [209.85.210.48]) by mx1.freebsd.org (Postfix) with ESMTP id 53F18F3E
 for <freebsd-stable@freebsd.org>; Mon, 28 Jan 2013 01:10:55 +0000 (UTC)
Received: by mail-da0-f48.google.com with SMTP id k18so986535dae.21
 for <freebsd-stable@freebsd.org>; Sun, 27 Jan 2013 17:10:54 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:x-received:in-reply-to:references:date:message-id
 :subject:from:to:cc:content-type;
 bh=TxMEnua4kP/Yq4Y/Rha8rda9Wee9tgXr4iaKBKJYLBM=;
 b=T1B0FRQiQTi4uJ6YCPa0sZA5HNK/FE4mPsA/H9P9PMkgzmUoTFGk41aK4lkKvbjbU2
 T//svP6yRl+EbsdJhP7WNGJKYfZhF/41tSYEjUsS06Zjq3P+bLWP3dS/dJE0Ziif6CaJ
 63v/v/oquge9qV9bIoxoUFDxhj2kckVc3gKyscKdOvDD6ziUL7/GCmtg5BMnNjeYML0k
 M63YOIELBx1/bdCzPgnSgHiYPNf6NpQw9jY3T4KHgyJmQDsJsnnCZ9ziV7ILV8yOIpmL
 GKel7kJrylFDcQsnl3vUvTmaz1KQ0PC6x5hx2996/wMGJHw33DsHvnavPZDCB1e1lGoE
 mQRQ==
MIME-Version: 1.0
X-Received: by 10.66.81.199 with SMTP id c7mr31995906pay.39.1359335454755;
 Sun, 27 Jan 2013 17:10:54 -0800 (PST)
Received: by 10.67.2.65 with HTTP; Sun, 27 Jan 2013 17:10:54 -0800 (PST)
In-Reply-To: <51057DA1.2090408@xs4all.nl>
References: <51057DA1.2090408@xs4all.nl>
Date: Sun, 27 Jan 2013 17:10:54 -0800
Message-ID: <CAN6yY1sPz+BH9O3dnyiH3Mv+u27BLuhkvbPdR7LSCmb9j=VkRg@mail.gmail.com>
Subject: Re: mergemaster -p / installkernel problem
From: Kevin Oberman <kob6558@gmail.com>
To: Michiel Boland <boland37@xs4all.nl>
Content-Type: text/plain; charset=UTF-8
Cc: FreeBSD Stable <freebsd-stable@freebsd.org>
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Production branch of FreeBSD source code <freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-stable>,
 <mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
 <mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Jan 2013 01:10:55 -0000

On Sun, Jan 27, 2013 at 11:18 AM, Michiel Boland <boland37@xs4all.nl> wrote:
> # mergemaster -p
>
> *** Creating the temporary root environment in /var/tmp/temproot
>  *** /var/tmp/temproot ready for use
>  *** Creating and populating directory structure in /var/tmp/temproot
>
>
>
> *** Beginning comparison
>
>
> *** Comparison complete
>
> *** /var/tmp/temproot is empty, deleting
>
> # make installkernel
> ERROR: Required auditdistd user is missing, see /usr/src/UPDATING.
> *** [installcheck_UGID] Error code 1
>
> Stop in /usr/src.
> *** [installkernel] Error code 1
>
> Stop in /usr/src.
>
>
>
> Why doesn't mergemaster find the updated master.password file?
>
> # grep FreeBSD /etc/master.passwd
> # $FreeBSD: stable/9/etc/master.passwd 218047 2011-01-28 22:29:38Z pjd $
> # grep FreeBSD /usr/src/etc/master.passwd
> # $FreeBSD: stable/9/etc/master.passwd 243947 2012-12-06 11:52:31Z rwatson $

If you 'grep auditdistd /usr/src/etc/master.passwd', does is it there?
I have the same version and auditdistd is there, and mergemaster -p
did catch it. You don't by any chance have a mergemaster.rc in /etc or
.mergemasterrc in $HOME?
-- 
R. Kevin Oberman, Network Engineer
E-mail: kob6558@gmail.com