d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Document the two new options, pre buildworld mode and

Browse Source 
post-mm rc.conf[.local] comparisons.
This commit is contained in:
Doug Barton 2002-04-08 09:49:40 +00:00
parent f9209c6234
commit 86ba3dedb9
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=94188
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,7 @@
.Nd merge configuration files, et al during an upgrade
.Sh SYNOPSIS
.Nm
.Op Fl scrvahi
.Op Fl scrvahipC
.Op Fl m Ar /path/to/sources
.Op Fl t Ar /path/to/temp/root
.Op Fl d
@ -185,6 +185,17 @@ Display usage and help information.
.It Fl i
Automatically install any files that do not exist in the
destination directory.
.It Fl p
Pre-buildworld mode.
Compares only files known to be essential to the sucess of
{build|install}world,
including
.Pa /etc/make.conf .
.It Fl C
After a standard
.Nm
run,
compares your rc.conf[.local] options to the defaults.
.It Fl m Ar /path/to/sources
Specify the path to the directory where you want to do the
.Xr make 1 .