#
# dispatch-conf.conf
#
# Directory to archive replaced configs
archive-dir=/etc/config-archive
# Use rcs for storing files in the archive directory?
# (yes or no)
use-rcs=no
# Diff for display
# %s old file
# %s new file
#diff=”diff -Nu %s %s | less –no-init –QUIT-AT-EOF”
diff=”colordiff -u %s %s | less”
# Diff for interactive merges.
# %s output file
# %s old file
# %s new file
merge=”sdiff –suppress-common-lines –output=%s %s %s”
# Automerge files comprising only CVS interpolations (e.g. Header or Id)
# (yes or no)
replace-cvs=yes
# Automerge files comprising only whitespace and/or comments
# (yes or no)
replace-wscomments=yes
# Automerge files that the user hasn’t modified
# (yes or no)
replace-unmodified=yes
# Per-session log file of changes made to configuration files
log-file=/var/log/dispatch-conf.log
NOTE:
You can disable this feature by setting CONFIG_PROTECT=”-*” in /etc/make.conf.
Then, Portage will mercilessly auto-update your config files. Alternatively,
you can leave Config File Protection on but tell Portage that it can overwrite
files in certain specific /etc subdirectories. For example, if you wanted
Portage to automatically update your rc scripts and your wget configuration,
but didn’t want any other changes made without your explicit approval, you’d
add this to /etc/make.conf:
CONFIG_PROTECT_MASK=/etc/wget /etc/rc.d