diff options
author | Renato Botelho <renato@netgate.com> | 2015-11-20 16:20:38 -0200 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2015-11-20 16:20:56 -0200 |
commit | 8248f5e4dd7f6745d7feb3092bbc1655ef71af34 (patch) | |
tree | 25ae35217e213301ed79e38b296d4ac4d0af77f6 /tools | |
parent | 14c0d104dce55aab11b1a0514bc237804646c7c0 (diff) | |
download | pfsense-8248f5e4dd7f6745d7feb3092bbc1655ef71af34.zip pfsense-8248f5e4dd7f6745d7feb3092bbc1655ef71af34.tar.gz |
Do not overwrite /etc/hosts and /etc/syslog.conf during base update. Fixes #5504
Diffstat (limited to 'tools')
-rw-r--r-- | tools/templates/core_pkg/base-nanobsd/exclude_files | 2 | ||||
-rw-r--r-- | tools/templates/core_pkg/base/exclude_files | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/tools/templates/core_pkg/base-nanobsd/exclude_files b/tools/templates/core_pkg/base-nanobsd/exclude_files index 3ad5816..2c915af 100644 --- a/tools/templates/core_pkg/base-nanobsd/exclude_files +++ b/tools/templates/core_pkg/base-nanobsd/exclude_files @@ -13,6 +13,7 @@ ./etc/dh-parameters.4096 ./etc/fstab ./etc/group +./etc/hosts ./etc/master.passwd ./etc/master.passwd.db ./etc/passwd @@ -20,6 +21,7 @@ ./etc/pwd.db ./etc/rc.conf ./etc/spwd.db +./etc/syslog.conf ./media ./mnt ./proc diff --git a/tools/templates/core_pkg/base/exclude_files b/tools/templates/core_pkg/base/exclude_files index 3ad5816..2c915af 100644 --- a/tools/templates/core_pkg/base/exclude_files +++ b/tools/templates/core_pkg/base/exclude_files @@ -13,6 +13,7 @@ ./etc/dh-parameters.4096 ./etc/fstab ./etc/group +./etc/hosts ./etc/master.passwd ./etc/master.passwd.db ./etc/passwd @@ -20,6 +21,7 @@ ./etc/pwd.db ./etc/rc.conf ./etc/spwd.db +./etc/syslog.conf ./media ./mnt ./proc |