From 5258cd801edee2afe9b1bceacb4c7cfca3dc9357 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Fri, 11 Sep 2015 08:21:45 +0200 Subject: sshdcond - 2.1.x compatible boot check --- config/sshdcond/sshdcond.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config/sshdcond/sshdcond.inc b/config/sshdcond/sshdcond.inc index c7c19291..9c3a8bb9 100644 --- a/config/sshdcond/sshdcond.inc +++ b/config/sshdcond/sshdcond.inc @@ -62,7 +62,11 @@ function sshdcond_custom_php_write_config() { global $g, $config, $pkg_interface; /* Detect boot process, do nothing during boot. */ - if (platform_booting()) { + if (function_exists("platform_booting")) { + if (platform_booting()) { + return; + } + } elseif ($g['booting']) { return; } -- cgit v1.2.3 From 83fcddda48f441d4a8172eb429b3f8f5100af8e4 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Fri, 11 Sep 2015 08:25:15 +0200 Subject: ipguard - 2.1.x compatible boot check --- config/ipguard/ipguard.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config/ipguard/ipguard.inc b/config/ipguard/ipguard.inc index 53284c96..68e08e9f 100644 --- a/config/ipguard/ipguard.inc +++ b/config/ipguard/ipguard.inc @@ -41,7 +41,11 @@ function ipguard_custom_php_write_config() { global $g, $config; /* Detect boot process and do nothing */ - if (platform_booting()) { + if (function_exists("platform_booting")) { + if (platform_booting()) { + return; + } + } elseif ($g['booting']) { return; } -- cgit v1.2.3 From 57f1f5ab8e8c5b9e3446b1c1f773b52248e7f9a1 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Fri, 11 Sep 2015 08:28:45 +0200 Subject: lcdproc-dev - 2.1.x compatible boot check --- config/lcdproc-dev/lcdproc.inc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/config/lcdproc-dev/lcdproc.inc b/config/lcdproc-dev/lcdproc.inc index e9656afd..2282d4e3 100644 --- a/config/lcdproc-dev/lcdproc.inc +++ b/config/lcdproc-dev/lcdproc.inc @@ -139,12 +139,14 @@ function sync_package_lcdproc_screens() { } function sync_package_lcdproc() { - global $g; - global $config; - global $input_errors; + global $g, $config, $input_errors; # Detect boot process - if (platform_booting()) { + if (function_exists("platform_booting")) { + if (platform_booting()) { + return; + } + } elseif ($g['booting']) { return; } -- cgit v1.2.3 From 8db0d25c53d4d49e6740eed2d7bb24ddecc48849 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Fri, 11 Sep 2015 08:35:14 +0200 Subject: sarg - 2.1.x compatible boot check --- config/sarg/sarg.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config/sarg/sarg.inc b/config/sarg/sarg.inc index 446b5f82..85410560 100644 --- a/config/sarg/sarg.inc +++ b/config/sarg/sarg.inc @@ -192,7 +192,11 @@ function sync_package_sarg() { global $config, $g, $sarg_proxy; // detect boot process - if (platform_booting()) { + if (function_exists("platform_booting")) { + if (platform_booting()) { + return; + } + } elseif ($g['booting']) { return; } -- cgit v1.2.3 From 46ddb5b2270dd1aaa2e56a76ebb363fe3de6b47c Mon Sep 17 00:00:00 2001 From: doktornotor Date: Fri, 11 Sep 2015 08:38:52 +0200 Subject: squid - 2.1.x compatible boot check --- config/squid/squid.inc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/config/squid/squid.inc b/config/squid/squid.inc index 27bff27b..5a0946bb 100644 --- a/config/squid/squid.inc +++ b/config/squid/squid.inc @@ -543,10 +543,15 @@ function squid_validate_auth($post, &$input_errors) { } function squid_install_cron($should_install) { - global $config; - if (platform_booting()) { + global $g, $config; + if (function_exists("platform_booting")) { + if (platform_booting()) { + return; + } + } elseif ($g['booting']) { return; } + parse_config(true); if (is_array($config['installedpackages']['squidcache'])) { -- cgit v1.2.3 From c4cbd93281bebf93e411ba1d21a94260804376e0 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Fri, 11 Sep 2015 08:57:38 +0200 Subject: nut - 2.1.x compatible boot check Another code simplification... --- config/nut/nut.inc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/config/nut/nut.inc b/config/nut/nut.inc index 71b06932..a864b965 100644 --- a/config/nut/nut.inc +++ b/config/nut/nut.inc @@ -492,8 +492,7 @@ EOD; } function sync_package_nut() { - global $config; - global $input_errors; + global $g, $config, $input_errors; stop_service("nut"); @@ -509,10 +508,12 @@ EOD; $return = sync_package_nut_snmp(); } - if ((!platform_booting()) && (nut_config('monitor'))) { - /* only start if enabled and system is not booting */ - /* this prevents service from starting / stopping / starting on boot */ - + /* only start if enabled and system is not booting */ + /* this prevents service from starting / stopping / starting on boot */ + if ((function_exists("platform_booting")) && (!platform_booting()) && (nut_config('monitor'))) { + log_error("[nut] INFO: Starting service"); + start_service("nut"); + } elseif ((!($g['booting'])) && (nut_config('monitor'))) { log_error("[nut] INFO: Starting service"); start_service("nut"); } elseif (!$return && file_exists(NUT_RCFILE)) { -- cgit v1.2.3 From 2d955284c5c7ca1be64fa2d49efbe3e3df6a1e86 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Fri, 11 Sep 2015 09:00:31 +0200 Subject: Bump package versions for boot check fixes --- pkg_config.10.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 082bf101..828d0fd7 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -606,7 +606,7 @@ https://packages.pfsense.org/packages/config/sarg/sarg.xml https://forum.pfsense.org/index.php/topic,47765.0.html sarg-2.3.9-##ARCH##.pbi - 0.6.5 + 0.6.6 Release 2.2 www @@ -633,7 +633,7 @@ https://packages.pfsense.org/packages/config/ipguard/ipguard.xml https://forum.pfsense.org/index.php/topic,49917.msg263664.html#msg263664 ipguard-1.04_2-##ARCH##.pbi - 0.1.1 + 0.1.2 beta 2.2 ipguard.xml @@ -814,7 +814,7 @@ Network UPS Tools. http://www.networkupstools.org/ Network Management - 2.0.9 + 2.1.0 BETA 2.2 rswagoner@gmail.com @@ -1025,7 +1025,7 @@ High performance web proxy cache. http://www.squid-cache.org/ Network - 4.3.8 + 4.3.9 Stable 2.2 fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org @@ -1096,7 +1096,7 @@ LCD display driver - development version. http://www.lcdproc.org/ Utility - 0.9.13 + 0.9.14 BETA 2.2 michele@nt2.it @@ -1336,7 +1336,7 @@ ]]> Enhancements - 1.0.4 + 1.0.5 Beta 2.2 https://packages.pfsense.org/packages/config/sshdcond/sshdcond.xml -- cgit v1.2.3 From f91e5d6d006c9d320d9190d5f1577e6436c5e986 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Fri, 11 Sep 2015 09:04:56 +0200 Subject: Bump package versions for boot check fixes --- pkg_config.8.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 5db18645..161b5519 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -675,7 +675,7 @@ sarg-2.3.6_2.tbz gd-2.0.35_8,1.tbz sarg-2.3.6_2-i386.pbi - 2.3.6_2 pkg v.0.6.3 + 2.3.6_2 pkg v.0.6.6 Release 2.0 sarg.xml @@ -696,7 +696,7 @@ https://files.pfsense.org/packages/8/All/ ipguard-1.04.tbz ipguard-1.04-i386.pbi - 1.0.4 pkg v.0.1 + 1.0.4 pkg v.0.1.2 beta 2.0 ipguard.xml @@ -916,7 +916,7 @@ Network UPS Tools http://www.networkupstools.org/ Network Management - 2.6.5_1 pkg 2.0.4 + 2.6.5_1 pkg 2.1.0 BETA 2.0 rswagoner@gmail.com @@ -1130,7 +1130,7 @@ High performance web proxy cache. http://www.squid-cache.org/ Network - 2.7.9 pkg v.4.3.4 + 2.7.9 pkg v.4.3.9 Stable 2 fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org @@ -1232,7 +1232,7 @@ LCD display driver - Development version http://www.lcdproc.org/ Utility - lcdproc-0.5.6 pkg v. 0.9.11 + lcdproc-0.5.6 pkg v. 0.9.14 BETA 2.0 michele@nt2.it @@ -1563,7 +1563,7 @@ This package acts as an access list frontend for ssh connections]]> Enhancements - 1.0.1 + 1.0.5 Beta 2.0 https://packages.pfsense.org/packages/config/sshdcond/sshdcond.xml -- cgit v1.2.3 From fb2aaef04afcac0361317a519244013bb2b6b1be Mon Sep 17 00:00:00 2001 From: doktornotor Date: Fri, 11 Sep 2015 09:07:12 +0200 Subject: Bump package versions for boot check fixes --- pkg_config.8.xml.amd64 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 67b401fd..61b4c4a3 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -662,7 +662,7 @@ sarg-2.3.6_2.tbz gd-2.0.35_8,1.tbz sarg-2.3.6_2-amd64.pbi - 2.3.6_2 pkg v.0.6.3 + 2.3.6_2 pkg v.0.6.6 Release 2.0 sarg.xml @@ -683,7 +683,7 @@ https://files.pfsense.org/packages/amd64/8/All/ ipguard-1.04.tbz ipguard-1.04-amd64.pbi - 1.0.4 pkg v.0.1 + 1.0.4 pkg v.0.1.2 beta 2.0 ipguard.xml @@ -903,7 +903,7 @@ Network UPS Tools http://www.networkupstools.org/ Network Management - 2.6.5_1 pkg 2.0.4 + 2.6.5_1 pkg 2.1.0 BETA 2.0 rswagoner@gmail.com @@ -1117,7 +1117,7 @@ High performance web proxy cache. http://www.squid-cache.org/ Network - 2.7.9 pkg v.4.3.4 + 2.7.9 pkg v.4.3.9 Stable 2 fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org @@ -1219,7 +1219,7 @@ LCD display driver - Development version http://www.lcdproc.org/ Utility - lcdproc-0.5.6 pkg v. 0.9.11 + lcdproc-0.5.6 pkg v. 0.9.14 BETA 2.0 michele@nt2.it @@ -1550,7 +1550,7 @@ This package acts as an access list frontend for ssh connections]]> Enhancements - 1.0.1 + 1.0.5 Beta 2.0 https://packages.pfsense.org/packages/config/sshdcond/sshdcond.xml -- cgit v1.2.3