From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
install/update.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/install/update.php b/install/update.php
index 2dcb53d..4626b50 100644
--- a/install/update.php
+++ b/install/update.php
@@ -137,7 +137,7 @@
//** Include the distribution-specific installer class library and configuration
if(is_file('dist/lib/'.$dist['baseid'].'.lib.php')) include_once 'dist/lib/'.$dist['baseid'].'.lib.php';
include_once 'dist/lib/'.$dist['id'].'.lib.php';
-include_once 'dist/conf/'.$dist['id'].'.conf.php';
+include_once 'dist/conf/'.$dist['confid'].'.conf.php';
//** Get hostname
exec('hostname -f', $tmp_out);
@@ -378,7 +378,7 @@
} elseif($conf['bind']['installed'] == true) {
swriteln('Configuring BIND');
$inst->configure_bind();
- if(!$inst->find_installed_apps('haveged')) {
+ if(!is_installed('haveged')) {
swriteln("[INFO] haveged not detected - DNSSEC can fail");
}
} else {
--
Gitblit v1.9.1