You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 

66 lines
2.1 KiB

  1. #
  2. # dispatch-conf.conf
  3. #
  4. # Directory to archive replaced configs
  5. archive-dir=${EPREFIX}/etc/config-archive
  6. # Use rcs for storing files in the archive directory?
  7. # NOTE: You should install dev-vcs/rcs before enabling this option.
  8. # WARNING: When configured to use rcs, read and execute permissions of
  9. # archived files may be inherited from the first check in of a working
  10. # file, as documented in the ci(1) man page. This means that even if
  11. # the permissions of the working file have since changed, the older
  12. # permissions of the first check in may be inherited. As mentioned in
  13. # the ci(1) man page, users can control access to RCS files by setting
  14. # the permissions of the directory containing the files (see
  15. # archive-dir above).
  16. # (yes or no)
  17. use-rcs=no
  18. # Diff for display
  19. # %s old file
  20. # %s new file
  21. # If using colordiff instead of diff, the less -R option may be required
  22. # for correct display.
  23. diff="diff -Nu '%s' '%s'"
  24. # Set the pager for use with diff commands (this will
  25. # cause the PAGER environment variable to be ignored).
  26. # Setting pager="cat" will disable pager usage.
  27. pager=""
  28. # Default options used if less is the pager
  29. less-opts="--no-init --quit-if-one-screen"
  30. # Diff for interactive merges.
  31. # %s output file
  32. # %s old file
  33. # %s new file
  34. merge="sdiff --suppress-common-lines --output='%s' '%s' '%s'"
  35. # Automerge files comprising only CVS interpolations (e.g. Header or Id)
  36. # (yes or no)
  37. replace-cvs=yes
  38. # Automerge files comprising only whitespace and/or comments
  39. # (yes or no)
  40. replace-wscomments=no
  41. # Automerge files that the user hasn't modified
  42. # (yes or no)
  43. replace-unmodified=no
  44. # Ignore a version that is identical to the previously merged version,
  45. # even though it is different from the current user modified version
  46. # Note that emerge already has a similar feature enabled by default,
  47. # which can be disabled by the emerge --noconfmem option.
  48. # (yes or no)
  49. ignore-previously-merged=no
  50. # Per-session log file of changes made to configuration files
  51. #log-file=/var/log/dispatch-conf.log
  52. # List of frozen files for which dispatch-conf will automatically zap updates
  53. #frozen-files=""