summaryrefslogtreecommitdiffstats
path: root/etc/inc/voucher.inc
diff options
context:
space:
mode:
authorErmal LUÇI <eri@pfsense.org>2014-11-26 13:10:01 +0100
committerErmal LUÇI <eri@pfsense.org>2014-11-26 13:10:01 +0100
commit285ef132f7d671620f269a57d2ebcff585d2a493 (patch)
treeb491fad66d22765d9640b2ac543c41b6e417a95d /etc/inc/voucher.inc
parent32e834ffd3b4cc6cdc6b147c91cb6dbcb0a93288 (diff)
downloadpfsense-285ef132f7d671620f269a57d2ebcff585d2a493.zip
pfsense-285ef132f7d671620f269a57d2ebcff585d2a493.tar.gz
Rather than set the g['booting'] on globals provide a function to test for that doing the right checks
Diffstat (limited to 'etc/inc/voucher.inc')
-rw-r--r--etc/inc/voucher.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/inc/voucher.inc b/etc/inc/voucher.inc
index 56329df..1a79a4e 100644
--- a/etc/inc/voucher.inc
+++ b/etc/inc/voucher.inc
@@ -492,11 +492,11 @@ function voucher_configure($sync = false) {
if (is_array($config['voucher'])) {
foreach ($config['voucher'] as $voucherzone => $vcfg) {
- if ($g['booting'])
+ if (platform_booting())
echo gettext("Enabling voucher support... ");
$cpzone = $voucherzone;
$error = voucher_configure_zone($sync);
- if ($g['booting']) {
+ if (platform_booting()) {
if ($error)
echo "error\n";
else
@@ -541,7 +541,7 @@ function voucher_configure_zone($sync = false) {
@chmod("{$g['varetc_path']}/voucher_{$cpzone}.cfg", 0600);
unlock($voucherlck);
- if (($g['booting'] || $sync == true) && is_array($config['voucher'][$cpzone]['roll'])) {
+ if ((platform_booting() || $sync == true) && is_array($config['voucher'][$cpzone]['roll'])) {
$voucherlck = lock("voucher{$cpzone}", LOCK_EX);
OpenPOWER on IntegriCloud