From e02a5d8c0f8627ed0259e1cc91dbbdaeb9746602 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Thu, 19 Nov 2015 12:54:37 -0200 Subject: Make sure /etc/dh-parameters* are not overwriteen during update, fixes #4816 --- tools/builder_common.sh | 1 + tools/templates/core_pkg/base/exclude_files | 3 +++ 2 files changed, 4 insertions(+) (limited to 'tools') 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 -- cgit v1.1