aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2015-02-12 09:56:21 -0500
committerjim-p <jimp@pfsense.org>2015-02-12 09:56:21 -0500
commit8b1b7e27646806c6b283f93a62fd59ed6083f97e (patch)
tree6643d78130104635478cdcb4fe4aea70a2a5ab07 /config
parent13b36fee54dd7f7b5e59d0b338960e264077bf43 (diff)
downloadpfsense-packages-8b1b7e27646806c6b283f93a62fd59ed6083f97e.tar.gz
pfsense-packages-8b1b7e27646806c6b283f93a62fd59ed6083f97e.tar.bz2
pfsense-packages-8b1b7e27646806c6b283f93a62fd59ed6083f97e.zip
Fixup config path for lcdproc on 2.2
Diffstat (limited to 'config')
-rw-r--r--config/lcdproc-dev/lcdproc.inc7
-rw-r--r--config/lcdproc/lcdproc.inc7
2 files changed, 12 insertions, 2 deletions
diff --git a/config/lcdproc-dev/lcdproc.inc b/config/lcdproc-dev/lcdproc.inc
index 73827721..fed2e7dc 100644
--- a/config/lcdproc-dev/lcdproc.inc
+++ b/config/lcdproc-dev/lcdproc.inc
@@ -32,7 +32,12 @@
require_once("service-utils.inc");
/* LCDproc */
define('LCDPROC_RCFILE', '/usr/local/etc/rc.d/lcdproc.sh');
- define('LCDPROC_CONFIG','/usr/local/etc/LCDd.conf');
+ $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
+ if (($pfs_version == "2.2") && is_dir('/usr/pbi/lcdproc-' . php_uname('m'))) {
+ define('LCDPROC_CONFIG', '/usr/pbi/lcdproc-' . php_uname('m') . '/local/etc/LCDd.conf');
+ } else {
+ define('LCDPROC_CONFIG','/usr/local/etc/LCDd.conf');
+ }
define('LCDPROC_HOST','localhost');
define('LCDPROC_PORT','13666');
define('LCDPROC_SERVICE_NAME','lcdproc');
diff --git a/config/lcdproc/lcdproc.inc b/config/lcdproc/lcdproc.inc
index 760732df..321328bc 100644
--- a/config/lcdproc/lcdproc.inc
+++ b/config/lcdproc/lcdproc.inc
@@ -33,7 +33,12 @@
/* LCDproc */
define('LCDPROC_RCFILE', '/usr/local/etc/rc.d/lcdproc.sh');
define('LCDPROC_CLIENT', '/tmp/lcdclient.sh');
- define('LCDPROC_CONFIG','/usr/local/etc/LCDd.conf');
+ $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
+ if (($pfs_version == "2.2") && is_dir('/usr/pbi/lcdproc-' . php_uname('m'))) {
+ define('LCDPROC_CONFIG', '/usr/pbi/lcdproc-' . php_uname('m') . '/local/etc/LCDd.conf');
+ } else {
+ define('LCDPROC_CONFIG','/usr/local/etc/LCDd.conf');
+ }
define('LCDPROC_HOST','localhost');
define('LCDPROC_PORT','13666');