From owner-freebsd-current@FreeBSD.ORG Mon Dec 3 07:06:18 2012 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1BD049DC; Mon, 3 Dec 2012 07:06:18 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-ob0-f182.google.com (mail-ob0-f182.google.com [209.85.214.182]) by mx1.freebsd.org (Postfix) with ESMTP id 8C7B28FC14; Mon, 3 Dec 2012 07:06:17 +0000 (UTC) Received: by mail-ob0-f182.google.com with SMTP id 16so2789676obc.13 for ; Sun, 02 Dec 2012 23:06:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=QRYrq0aefnrpjzuC5B5tdU9mmOi4X/93tE1PPOaU/nw=; b=P2KMRASjHWHptmjvmeSSy7QZg6Lb3wAQgPLt4v0ZP0fO3j2sAX0xU8EEmdeX7/jLgD pQ0juA3FkxyGguKR7PyGTx8cQavgBdsAEvZHYKorhRbc9YKgcEwDbBZd5ZRO2eT4EHjm b06OJH6E29v11Ob4XhSmX/B05lMH5FTmMWTPhRrkqW7RurS2e2H9XfUghJh/DoU55lvM LNsB1AyupEa+rKsCAD6HIIEMJ6NT8ubkHuhadDq7pbaFPyXj5thAyIxA5R2LIH+h2hbM ra7gH0KiAXmLUN/knoJbM5TVJ8wZMGD1vmpMK720ed7NeP85tlcJLNH5F01Wn/I0HgFD /NgA== MIME-Version: 1.0 Received: by 10.60.170.114 with SMTP id al18mr7603555oec.56.1354518376900; Sun, 02 Dec 2012 23:06:16 -0800 (PST) Received: by 10.76.143.33 with HTTP; Sun, 2 Dec 2012 23:06:16 -0800 (PST) In-Reply-To: References: Date: Sun, 2 Dec 2012 23:06:16 -0800 Message-ID: Subject: Re: please add auditdistd user/group to -stable and the 9.1-release? From: Garrett Cooper To: Adrian Chadd Content-Type: text/plain; charset=ISO-8859-1 Cc: freebsd-current , Robert Watson , Ken Smith X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Dec 2012 07:06:18 -0000 On Sun, Dec 2, 2012 at 9:20 PM, Garrett Cooper wrote: > On Sun, Dec 2, 2012 at 9:08 PM, Adrian Chadd wrote: >> Hi, >> >> Would you guys please add the auditdistd user/group info to >> 9.1-release, so people doing crossbuilds of -HEAD on a fresh >> 9.1-RELEASE won't get an install error? > > Or mtree could just use -w instead in Makefile.inc1 and distribute. > Let me do some investigation to determine whether or not this is a > valid solution to this problem. I've done some digging in the source tree and this seems like a potentially workable solution for the issue reported -- in part because auditdistd is only present in BSD.var.dist, /etc/rc.d/var runs BSD.var.dist at boot, etc: Index: etc/Makefile =================================================================== --- etc/Makefile (revision 243802) +++ etc/Makefile (working copy) @@ -293,7 +293,7 @@ distrib-dirs: mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.root.dist -p ${DESTDIR}/ - mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.var.dist -p ${DESTDIR}/var + mtree -eUw ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.var.dist -p ${DESTDIR}/var mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.usr.dist -p ${DESTDIR}/usr mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.include.dist \ -p ${DESTDIR}/usr/include I'm running a build still to confirm this. I'll look into a more generic solution, but this should get people past r243752 without having to install a master.passwd file everywhere with auditdistd in it. A better solution would potentially be to delay processing the mtree files until later and run it via another script which could handle sequencing things properly (either directly via mtree, or better, via a make target). I have other ideas for this but I need to sleep on them because they might not seem workable later. Thanks, -Garrett