Date: Thu, 16 Mar 2017 01:38:04 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r315343 - stable/10/usr.sbin/mergemaster Message-ID: <201703160138.v2G1c4Ds058425@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Thu Mar 16 01:38:04 2017 New Revision: 315343 URL: https://svnweb.freebsd.org/changeset/base/315343 Log: MFC r314830: mergemaster: fix description of -p -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. Modified: stable/10/usr.sbin/mergemaster/mergemaster.8 Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/mergemaster/mergemaster.8 ============================================================================== --- stable/10/usr.sbin/mergemaster/mergemaster.8 Thu Mar 16 01:36:09 2017 (r315342) +++ stable/10/usr.sbin/mergemaster/mergemaster.8 Thu Mar 16 01:38:04 2017 (r315343) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 29, 2015 +.Dd March 6, 2017 .Dt MERGEMASTER 8 .Os .Sh NAME @@ -226,9 +226,10 @@ destination directory. .It Fl p Pre-buildworld mode. Compares only files known to be essential to the success of -{build|install}world, -including -.Pa /etc/make.conf . +{build|install}world, i.e., +.Pa /etc/group +and +.Pa /etc/master.passwd . .It Fl F If the files differ only by VCS Id ($FreeBSD) install the new file.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703160138.v2G1c4Ds058425>