From 8248f5e4dd7f6745d7feb3092bbc1655ef71af34 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Fri, 20 Nov 2015 16:20:38 -0200 Subject: Do not overwrite /etc/hosts and /etc/syslog.conf during base update. Fixes #5504 --- tools/templates/core_pkg/base-nanobsd/exclude_files | 2 ++ tools/templates/core_pkg/base/exclude_files | 2 ++ 2 files changed, 4 insertions(+) (limited to 'tools/templates') 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 -- cgit v1.1