Re: Can't build kernel with ndis

2012-12-28 Thread Thomas Mueller
Once you get used to it, the merge operation in mergemaster is pretty easy to use on most files. Always use 'r' for the $FreeBSD$ line and 'l' for the sections that are modified. In the password and group files, it is usually just 'r' followed by a few 'l's. I run the pre-buildworld run (-p)

Re: Can't build kernel with ndis

2012-12-27 Thread Thomas Mueller
If you want to insert the auditdistd user manually, that is fine, though I find doing it with mergemaster easier. (If you use it correctly ('m' option), it won't destroy your password file. But don't do it with vi. the actual pssword file is only a part of the process and the tool to properly

Re: Can't build kernel with ndis

2012-12-27 Thread Kevin Oberman
On Thu, Dec 27, 2012 at 2:48 AM, Thomas Mueller muelle...@insightbb.com wrote: If you want to insert the auditdistd user manually, that is fine, though I find doing it with mergemaster easier. (If you use it correctly ('m' option), it won't destroy your password file. But don't do it with vi.