From owner-freebsd-current Thu Dec 31 17:54:50 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id RAA18532 for freebsd-current-outgoing; Thu, 31 Dec 1998 17:54:50 -0800 (PST) (envelope-from owner-freebsd-current@FreeBSD.ORG) Received: from rip.psg.com (rip.psg.com [147.28.0.39]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id RAA18527 for ; Thu, 31 Dec 1998 17:54:49 -0800 (PST) (envelope-from randy@psg.com) Received: from localhost (3525 bytes) by rip.psg.com via sendmail with P:stdio/R:inet_resolve/T:smtp (sender: ) (ident using unix) id for ; Thu, 31 Dec 1998 17:54:28 -0800 (PST) (Smail-3.2.0.101 1997-Dec-17 #1 built 1998-Oct-13) Message-Id: Date: Thu, 31 Dec 1998 17:54:28 -0800 (PST) From: Randy Bush MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit To: Nicole Harrington Cc: freebsd-current@FreeBSD.ORG Subject: RE: dummy's guide to flag day, please? References: Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG > Maybe I'm missing something but what does "mergemaster -cv" Mean/stand for? MERGEMASTER(8) FreeBSD System Manager's Manual MERGEMASTER(8) NAME mergemaster - Merge configuration files, et al during an upgrade SYNOPSIS mergemaster [-scrvah] [-t /path/to/temp/root] [-d] [-u N] [-w N] DESCRIPTION mergemaster is a Bourne shell script which is designed to aid you in up- dating the various configuration and other files associated with FreeBSD. It is HIGHLY recommended that you back up your /etc directory before be- ginning this process. The script uses /usr/src/etc/Makefile to build a temporary root environ- ment from / down, populating that environment with the various files. It then compares each file in that environment to its installed counterpart. When the script finds a change in the new file, or there is no installed version of the new file it gives you four options to deal with it. You can install the new file as is, delete the new file, merge the old and new files (as appropriate) using sdiff(1) or leave the file in the tempo- rary root environment to merge by hand later. By default it creates the temporary root in /var/tmp/temproot and com- pares the cvs(1) version $Id strings for files that have them, deleting the temporary file if the strings match. If there is no $Id string, or if the strings are different it compares the files themselves. You can also specify that the script ignore the $Id strings and compare every file. mergemaster checks your umask and issues a warning for anything other than 022. While it is not mandatory to grant world permissions for most configuration files, you may run into problems without them. If you choose a umask other than 022 and run into trouble later this could be the cause. /etc/master.passwd is treated as a special case. If you choose to install this file or a merged version of it the file permis- sions are always 600 (rw-------) for security reasons. The script uses the owner and group id's that the files are created with by /usr/src/etc/Makefile, and file permissions as specified by the umask. Unified diffs are used by default to display any differences unless you choose context diffs. The options are as follows: -s Perform a strict comparison, diff'ing every pair of files. -c Use context diffs instead of unified diffs. -r Re-run mergemaster on a previously cleaned directory, skip- ping the creation of the temporary root environment. This op- tion is compatible with all other options. -v Be more verbose about the process. You should probably use this option the first time you run mergemaster. -a Run automatically. This option will leave all the files that differ from the installed versions in the temporary directory to be dealt with by hand. If the temproot directory exists, ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message