From 0f9aadf4ee95ffa43d2b554a7550aa6777d99713 Mon Sep 17 00:00:00 2001 From: Dinko Korunic Date: Fri, 11 Apr 2008 21:44:44 +0200 Subject: [PATCH] - makni update_conf u functions.sh - ispravno proslijedi $* array u update_postfix (do sada nije dobivao $1 i $2) Signed-off-by: Dinko Korunic --- debian/postinst | 13 +------------ src/functions.sh | 10 ++++++++++ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/debian/postinst b/debian/postinst index 9e3b82e..10a632c 100755 --- a/debian/postinst +++ b/debian/postinst @@ -27,17 +27,6 @@ export PATH . /usr/share/amavisd-cn/variables.sh . /usr/share/amavisd-cn/functions.sh -# Place configuration tweaks done on upgrades into this function -update_conf() { - [ "$DEBIAN_SCRIPT_DEBUG" ] && set -vx - # placeholder. - # remember to set changed_config=1 and restart_daemon=1 if necessary - #: - if dpkg --compare-versions "$1" lt $MASTTMPLVERSION; then - conf_from_template - fi -} - mta=postfix . /usr/share/amavisd-cn/postfix.sh @@ -45,7 +34,7 @@ mta=postfix cp_get_mx_domain domain=$RET -update_postfix +update_postfix $* # amavisd.conf if [ -f "$ACONFOLD" ]; then diff --git a/src/functions.sh b/src/functions.sh index 57e754f..8a41591 100755 --- a/src/functions.sh +++ b/src/functions.sh @@ -139,6 +139,16 @@ conf_from_template() { changed_config=1 } +# Place configuration tweaks done on upgrades into this function +update_conf() { + # placeholder. + # remember to set changed_config=1 and restart_daemon=1 if necessary + #: + if dpkg --compare-versions "$2" lt "$MASTTMPLVERSION"; then + conf_from_template + fi +} + add_redirection() { until [ -z "$1" ] do -- 1.7.10.4