aboutsummaryrefslogtreecommitdiffstats
path: root/config/postfix
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-09-11 16:59:00 -0300
committerRenato Botelho <renato@netgate.com>2015-09-11 16:59:00 -0300
commit94552b1db607bd973becb7eb8e0d3e32d9fd4b90 (patch)
treefaef663bc614241f8ba115cd968bed515d811ea9 /config/postfix
parent4897bdd7deb318233d34d31ba1ea23b6b77b2215 (diff)
parent7e476a1263bda6c11fbf76b8cbe76598b98571c8 (diff)
downloadpfsense-packages-94552b1db607bd973becb7eb8e0d3e32d9fd4b90.tar.gz
pfsense-packages-94552b1db607bd973becb7eb8e0d3e32d9fd4b90.tar.bz2
pfsense-packages-94552b1db607bd973becb7eb8e0d3e32d9fd4b90.zip
Merge pull request #1059 from doktornotor/patch-6
Diffstat (limited to 'config/postfix')
-rwxr-xr-xconfig/postfix/postfix.inc12
1 files changed, 9 insertions, 3 deletions
diff --git a/config/postfix/postfix.inc b/config/postfix/postfix.inc
index f40922c6..0629c187 100755
--- a/config/postfix/postfix.inc
+++ b/config/postfix/postfix.inc
@@ -231,12 +231,18 @@ function check_cron(){
}
function sync_package_postfix($via_rpc="no") {
- global $config;
+ global $g, $config;
log_error("sync_package_postfix called with via_rpc={$via_rpc}");
# detect boot process
- if (is_array($_POST)){
- if (platform_booting()) {
+ if (is_array($_POST)) {
+ if (function_exists("platform_booting")) {
+ if (!platform_booting()) {
+ unset($boot_process);
+ } else {
+ $boot_process="on";
+ }
+ } elseif (!($g['booting'])) {
unset($boot_process);
} else {
$boot_process="on";