summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Haber <zugschlus@debian.org>2005-05-01 16:46:33 +0000
committerMarc Haber <zugschlus@debian.org>2005-05-01 16:46:33 +0000
commitd990edb517faad7551c59c00149a201b8e2f0ee4 (patch)
tree4bbd19940a6912d134fa4d0db6fc95680499e14c
parente88ba8372374f6a928544b20712a2e1da66349cf (diff)
downloadexim4-d990edb517faad7551c59c00149a201b8e2f0ee4.tar.gz
don't overwrite the disclaimer with the config file for conftype none
svn path=/exim/trunk/; revision=1132
-rw-r--r--debian/debconf/update-exim4.conf5
1 files changed, 3 insertions, 2 deletions
diff --git a/debian/debconf/update-exim4.conf b/debian/debconf/update-exim4.conf
index c840a8e..a0f485f 100644
--- a/debian/debconf/update-exim4.conf
+++ b/debian/debconf/update-exim4.conf
@@ -295,7 +295,8 @@ case "$dc_eximconfig_configtype" in
cat_parts ${UPEX4C_confd}/$i
done | \
removecomments | \
- sed -e "s/DEBCONF[^D][^E][^B].*DEBCONF//g" \ > ${UPEX4C_outputfile}.tmp
+ sed -e "s/DEBCONF[^D][^E][^B].*DEBCONF//g" \
+ >> ${UPEX4C_outputfile}.tmp
else
LOCALMACROS=""
if [ -e "/etc/exim4/exim4.conf.localmacros" ]; then
@@ -304,7 +305,7 @@ case "$dc_eximconfig_configtype" in
cat $LOCALMACROS /etc/exim4/exim4.conf.template | \
removecomments | \
sed -e "s/DEBCONF[^D][^E][^B].*DEBCONF//g" \
- > ${UPEX4C_outputfile}.tmp
+ >> ${UPEX4C_outputfile}.tmp
fi
mv -f ${UPEX4C_outputfile}.tmp ${UPEX4C_outputfile}
chmod ${CFILEMODE} ${UPEX4C_outputfile}