diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-05-25 17:58:57 +0000 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-05-25 17:58:57 +0000 |
| commit | dc10b475a5d0850d19d366c41dc00a48032b9d11 (patch) | |
| tree | e45964533eae359b70321e7b6a9091b27edff9c0 /postfix | |
| parent | 3916261fdf751705766ce004260584366212316c (diff) | |
Move needs_restart test up to before test material is removed.
Diffstat (limited to 'postfix')
| -rwxr-xr-x | postfix/postfix.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/postfix/postfix.sh b/postfix/postfix.sh index 10d041e..7afac07 100755 --- a/postfix/postfix.sh +++ b/postfix/postfix.sh @@ -3,7 +3,7 @@ # /etc/local-COMMON/postfix/postfix.sh # Copyright 2002-2007 Jonas Smedegaard <dr@jones.dk> # -# $Id: postfix.sh,v 1.73 2008-05-25 17:45:47 jonas Exp $ +# $Id: postfix.sh,v 1.74 2008-05-25 17:58:57 jonas Exp $ # # Auto-tweak plain installed postfix Debian package # @@ -341,6 +341,8 @@ case $do_update in fi rm -f "$tempdir/COMMANDS" + diff -q "$confdir/master.cf" "$tempdir/master.cf" || if [ $? -gt 1 ]; then exit $?; else needs_restart="1"; fi + cp -a -f -t "$confdir" "$tempdir"/* rm -rf "$tempdir" @@ -348,7 +350,6 @@ case $do_update in postmap "$confdir/$file" done - diff -q "$confdir/master.cf" "$tempdir/master.cf" || if [ $? -gt 1 ]; then exit $?; else needs_restart="1"; fi if [ "1" = "$needs_restart" ]; then invoke-rc.d postfix restart else |