aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authordoktornotor <notordoktor@gmail.com>2015-09-11 08:47:11 +0200
committerdoktornotor <notordoktor@gmail.com>2015-09-11 08:47:11 +0200
commit33a92e86d0a3ca526555b3adaadacbe19d8bf6a8 (patch)
treefe8f5139f9db75110b2d544d7dfbe66b82130457 /config
parent6a69f1d92a1414d6df25143916929bafe5cec04e (diff)
downloadpfsense-packages-33a92e86d0a3ca526555b3adaadacbe19d8bf6a8.tar.gz
pfsense-packages-33a92e86d0a3ca526555b3adaadacbe19d8bf6a8.tar.bz2
pfsense-packages-33a92e86d0a3ca526555b3adaadacbe19d8bf6a8.zip
postfix - 2.1.x compatible boot check
Makes things a whole lot more simple, right...
Diffstat (limited to 'config')
-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 30a935bf..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";