mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-02-05 18:05:16 +00:00
Code Issues Releases Activity

mergemaster: fix description of -p

Browse Source 
-p only handles updating /etc/master.passwd and /etc/group . No more,
no less.

Also, mergemaster (and no other portions of the vanilla FreeBSD build
process) should be messing with __MAKECONF or SRCCONF as part of the
installworld or distribution process. Don't insinuate that mergemaster
does that as it's a false claim.

MFC after:	1 week
Sponsored by:	Dell EMC Isilon
This commit is contained in:
Enji Cooper 2017-03-07 04:13:22 +00:00
parent 0d0fae3406
commit ed8251f888
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=314830
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
usr.sbin/mergemaster/mergemaster.8
View File

@ -24,7 +24,7 @@
.\" .\"
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd September 29, 2015 .Dd March 6, 2017
.Dt MERGEMASTER 8 .Dt MERGEMASTER 8
.Os .Os
.Sh NAME .Sh NAME
@ -226,9 +226,10 @@ destination directory.
.It Fl p .It Fl p
Pre-buildworld mode. Pre-buildworld mode.
Compares only files known to be essential to the success of Compares only files known to be essential to the success of
{build|install}world, {build|install}world, i.e.,
including .Pa /etc/group
.Pa /etc/make.conf . and
.Pa /etc/master.passwd .
.It Fl F .It Fl F
If the files differ only by VCS Id ($FreeBSD) If the files differ only by VCS Id ($FreeBSD)
install the new file. install the new file.