mergemaster - merge configuration files, et al during an upgrade
The script uses /usr/src/etc/Makefile to build a temporary root environment from / down, populating that environment with the various files. You can specify a different source directory with the [-m ] command line option, or specify the destination directory with the [-D ] option. 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 temporary root environment to merge by hand later.
By default it creates the temporary root in /var/tmp/temproot and compares the cvs(1) version $Id/$FreeBSD 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.
The merge menu option is designed to let you easily combine your customizations from the old version of a file into the new one. While you can use the merge function to incorporate changes from files that you have not customized, it is not recommended.
The utility checks your umask and issues a warning for anything other than 022. While it is not mandatory to grant world read permissions for most configuration files, you may run into problems without them. If you choose a umask other than 022 and experience 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 permissions are always 600 (rw-------) for security reasons. After installing an updated version of this file you should probably run pwd_mkdb8 with the -p option to rebuild your password databases and recreate /etc/passwd
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 utility will source scripts that you specify right before it starts the comparison, and after it is done running. The easiest way to handle this is to place the path to the script(s) in the appropriate variables in your .mergemasterrc file. The script sourced before comparison is named in MM_PRE_COMPARE_SCRIPT and the one sourced after the script is done is MM_EXIT_SCRIPT This is the recommended way to specify local modifications, or files that you want to give special handling to. This includes files that you want to be deleted without being compared. Because the named scripts are sourced from within , all of the script's variables are available for use in your custom script. You can also use /etc/mergemaster.rc which will be read before .mergemasterrc Options specified on the command line are updated last, and therefore can override both files.
The options are as follows:
The utility will . (source) these files if they exist. Command line options will override rc file options. $HOME/.mergemasterrc overrides /etc/mergemaster.rc Here is an example with all values commented out:
# These are options for mergemaster, with their default values listed # The following options have command line overrides # # Directory to install the temporary root environment into #TEMPROOT='/var/tmp/temproot' # # Strict comparison bypasses the CVS $Id tests and compares every file #STRICT=no # # Type of diff, such as unified, context, etc. #DIFF_FLAG='-u' # # Additional options for diff. This will get unset when using -s. #DIFF_OPTIONS='-I$FreeBSD:.*[$]' # Ignores CVS Id tags # # Verbose mode includes more details and additional checks #VERBOSE= # # Automatically install files that do not exist on the system already #AUTO_INSTALL= # # Compare /etc/rc.conf[.local] to /etc/defaults/rc.conf #COMP_CONFS=yes # # Preserve files that you replace #PRESERVE_FILES=yes #PRESERVE_FILES_DIR=/var/tmp/mergemaster/preserved-files-`date +%y%m%d-%H%M%S` # # Sourcedir is the directory to do the 'make' in (where the new files are) #SOURCEDIR='/usr/src/etc' # # The umask for mergemaster to compare the default file's modes to #NEW_UMASK=022 # # Specify the destination directory for the installed files #DESTDIR= # # The following options have no command line overrides # For those who just cannot stand including the full path to PAGER #DONT_CHECK_PAGER= # # If you set 'yes' above, make sure to include the PATH to your pager #PATH=/bin:/usr/bin:/usr/sbin # # Don't compare the old and new motd files #IGNORE_MOTD=yes # # Specify the path to scripts to run before the comparison starts, # and/or after the script has finished its work #MM_PRE_COMPARE_SCRIPT= #MM_EXIT_SCRIPT=
Exit status is 1 if it fails for one of the following reasons:
Invalid command line option
Failure to create the temporary root environment
Failure to populate the temporary root
To use context diff's and have explain more things as it goes along, use:
# mergemaster -cv
To specify that put the temporary root environment in /usr/tmp/root use:
# mergemaster -t /usr/tmp/root
To specify a 110 column screen with a strict comparison, use:
# mergemaster -sw 110
Закладки на сайте
Проследить за страницей
Created 1996-2021 by Maxim Chirkov
Добавить, Поддержать, Вебмастеру