diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2014-09-23 12:07:38 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2014-09-23 12:07:38 -0300 |
| commit | 1430a34fd0278868052da6a6f8ccd32505300778 (patch) | |
| tree | f777b77453fad41a68fbfcaa576ff2fedbbe00b3 | |
| parent | 91f558f5bb14486b053ad9fb2a0f24b527665b59 (diff) | |
| parent | c84b249f0065959601e02b2717745b91c5b59728 (diff) | |
| download | pfsense-packages-1430a34fd0278868052da6a6f8ccd32505300778.tar.gz pfsense-packages-1430a34fd0278868052da6a6f8ccd32505300778.tar.bz2 pfsense-packages-1430a34fd0278868052da6a6f8ccd32505300778.zip | |
Merge pull request #705 from yylyyl/master
| -rw-r--r-- | config/lcdproc-dev/lcdproc.inc | 5 | ||||
| -rw-r--r-- | config/lcdproc-dev/lcdproc_client.php | 6 | ||||
| -rw-r--r-- | pkg_config.10.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 2 |
5 files changed, 9 insertions, 8 deletions
diff --git a/config/lcdproc-dev/lcdproc.inc b/config/lcdproc-dev/lcdproc.inc index 00768cd7..73827721 100644 --- a/config/lcdproc-dev/lcdproc.inc +++ b/config/lcdproc-dev/lcdproc.inc @@ -308,7 +308,8 @@ $config_text .= "[{$lcdproc_config['driver']}]\n"; $config_text .= "driverpath=/usr/local/lib/lcdproc/\n"; $config_text .= "ConnectionType={$lcdproc_config['connection_type']}\n"; - $config_text .= "Device={$realport}\n"; + if($lcdproc_config['comport'] != "none") + $config_text .= "Device={$realport}\n"; $config_text .= "Port=0x378\n"; $config_text .= "Speed=0\n"; $config_text .= "Keypad=yes\n"; @@ -502,7 +503,7 @@ EOD; restart_service(LCDPROC_SERVICE_NAME); } } - if((! $lcdproc_config['driver']) || ($lcdproc_config['comport'] == "none")) { + if((! $lcdproc_config['driver']) || (! $lcdproc_config['comport'])) { /* no parameters user does not want lcdproc running */ /* lets stop the service and remove the rc file */ if(file_exists(LCDPROC_RCFILE)) { diff --git a/config/lcdproc-dev/lcdproc_client.php b/config/lcdproc-dev/lcdproc_client.php index 5306c903..922ed14e 100644 --- a/config/lcdproc-dev/lcdproc_client.php +++ b/config/lcdproc-dev/lcdproc_client.php @@ -554,11 +554,11 @@ /* format speed in bits/sec, input: bytes/sec Code from: graph.php ported to PHP*/ if ($speed < 125000) - {return sprintf("%3d.1 Kbps", $speed / 125);} + {return sprintf("%5.1f Kbps", $speed / 125);} if ($speed < 125000000) - {return sprintf("%3d.1 Mbps", $speed / 125000);} + {return sprintf("%5.1f Mbps", $speed / 125000);} // else - return sprintf("%3d.1 Gbps", $speed / 125000000); + return sprintf("%5.1f Gbps", $speed / 125000000); } function add_summary_declaration(&$lcd_cmds, $name) { diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 216d995e..c771183d 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -971,7 +971,7 @@ <descr>LCD display driver - Development version</descr> <website>http://www.lcdproc.org/</website> <category>Utility</category> - <version>lcdproc-0.5.6 pkg v. 0.9.9</version> + <version>lcdproc-0.5.6 pkg v. 0.9.10</version> <status>BETA</status> <required_version>2.2</required_version> <maintainer>michele@nt2.it</maintainer> diff --git a/pkg_config.8.xml b/pkg_config.8.xml index afb70569..885e0b05 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1278,7 +1278,7 @@ <descr>LCD display driver - Development version</descr> <website>http://www.lcdproc.org/</website> <category>Utility</category> - <version>lcdproc-0.5.6 pkg v. 0.9.9</version> + <version>lcdproc-0.5.6 pkg v. 0.9.10</version> <status>BETA</status> <required_version>2.0</required_version> <maintainer>michele@nt2.it</maintainer> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index f64d6214..90a216b1 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1265,7 +1265,7 @@ <descr>LCD display driver - Development version</descr> <website>http://www.lcdproc.org/</website> <category>Utility</category> - <version>lcdproc-0.5.6 pkg v. 0.9.9</version> + <version>lcdproc-0.5.6 pkg v. 0.9.10</version> <status>BETA</status> <required_version>2.0</required_version> <maintainer>michele@nt2.it</maintainer> |