summaryrefslogtreecommitdiffstats
path: root/etc/freebsd-update.conf
diff options
context:
space:
mode:
authorcperciva <cperciva@FreeBSD.org>2007-11-28 22:45:09 +0000
committercperciva <cperciva@FreeBSD.org>2007-11-28 22:45:09 +0000
commit7891fefb70a8860e311798bd96e91afdd09f2032 (patch)
tree6a3aff3fb5cf5211659fb5fac0c8bfd4132c2911 /etc/freebsd-update.conf
parent40b96e645194aa223c8c8406e0300ce1692f9946 (diff)
downloadFreeBSD-src-7891fefb70a8860e311798bd96e91afdd09f2032.zip
FreeBSD-src-7891fefb70a8860e311798bd96e91afdd09f2032.tar.gz
Add /root/, /.cshrc, and /.profile to the default UpdateIfUnmodified
directive. Users get irritated if FreeBSD Update steps on these while upgrading to a new release. MFC after: 3 days
Diffstat (limited to 'etc/freebsd-update.conf')
-rw-r--r--etc/freebsd-update.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/freebsd-update.conf b/etc/freebsd-update.conf
index 7f634b2..001042e 100644
--- a/etc/freebsd-update.conf
+++ b/etc/freebsd-update.conf
@@ -24,7 +24,7 @@ IgnorePaths
# Paths which start with anything matching an entry in an UpdateIfUnmodified
# statement will only be updated if the contents of the file have not been
# modified by the user (unless changes are merged; see below).
-UpdateIfUnmodified /etc/ /var/
+UpdateIfUnmodified /etc/ /var/ /root/ /.cshrc /.profile
# When upgrading to a new FreeBSD release, files which match MergeChanges
# will have any local changes merged into the version from the new release.
OpenPOWER on IntegriCloud