Date: Sun, 2 Dec 2012 23:06:16 -0800 From: Garrett Cooper <yanegomi@gmail.com> To: Adrian Chadd <adrian@freebsd.org> Cc: freebsd-current <freebsd-current@freebsd.org>, Robert Watson <rwatson@freebsd.org>, Ken Smith <kensmith@freebsd.org> Subject: Re: please add auditdistd user/group to -stable and the 9.1-release? Message-ID: <CAGH67wQknTn1x2aU1HtgC=HweVe8i3qedCo1Tq2wtVOJW2og-Q@mail.gmail.com> In-Reply-To: <CAGH67wT4=9mpWHFxbJZ7DSzKD3%2B6POtxDjQqVm98hVx2yFUXcw@mail.gmail.com> References: <CAJ-VmokK6-3qtPid0ZszRnEKoN4oy7ZHiB5dVcAa8K4XhVbtOg@mail.gmail.com> <CAGH67wT4=9mpWHFxbJZ7DSzKD3%2B6POtxDjQqVm98hVx2yFUXcw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, Dec 2, 2012 at 9:20 PM, Garrett Cooper <yanegomi@gmail.com> wrote:
> On Sun, Dec 2, 2012 at 9:08 PM, Adrian Chadd <adrian@freebsd.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAGH67wQknTn1x2aU1HtgC=HweVe8i3qedCo1Tq2wtVOJW2og-Q>