diff options
| author | Renato Botelho <renato@netgate.com> | 2015-11-19 12:54:37 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-11-19 12:54:37 -0200 |
| commit | e02a5d8c0f8627ed0259e1cc91dbbdaeb9746602 (patch) | |
| tree | 1b089a8c426e7ae1180ae067662cf2ba0d350e37 /tools | |
| parent | 77764580d2892c1c301d1fe5c33dfa425f8752ff (diff) | |
| download | pfsense-e02a5d8c0f8627ed0259e1cc91dbbdaeb9746602.zip pfsense-e02a5d8c0f8627ed0259e1cc91dbbdaeb9746602.tar.gz | |
Make sure /etc/dh-parameters* are not overwriteen during update, fixes #4816
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/builder_common.sh | 1 | ||||
| -rw-r--r-- | tools/templates/core_pkg/base/exclude_files | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh index b9d423c..c87010d 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -341,6 +341,7 @@ create_Full_update_tarball() { rm -rf ${FINAL_CHROOT_DIR}/cf rm -rf ${FINAL_CHROOT_DIR}/conf + rm -f ${FINAL_CHROOT_DIR}/etc/dh-parameters.* rm -f ${FINAL_CHROOT_DIR}/etc/rc.conf rm -f ${FINAL_CHROOT_DIR}/etc/pwd.db 2>/dev/null rm -f ${FINAL_CHROOT_DIR}/etc/group 2>/dev/null diff --git a/tools/templates/core_pkg/base/exclude_files b/tools/templates/core_pkg/base/exclude_files index b323acb..3ad5816 100644 --- a/tools/templates/core_pkg/base/exclude_files +++ b/tools/templates/core_pkg/base/exclude_files @@ -8,6 +8,9 @@ ./conf.default/config.xml ./etc/bogons ./etc/bogonsv6 +./etc/dh-parameters.1024 +./etc/dh-parameters.2048 +./etc/dh-parameters.4096 ./etc/fstab ./etc/group ./etc/master.passwd |
