aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanilo G. Baio (dbaio) <dbaio@bsd.com.br>2014-04-14 15:26:52 -0300
committerDanilo G. Baio (dbaio) <dbaio@bsd.com.br>2014-04-14 15:26:52 -0300
commitafb2683350af9c66cf6708955f2af3016633c41b (patch)
treecedf5da0bf9c92c79054e6454d490b55f54f2669
parenta183c4a1f3568b889d0839dc1a29737a68fb01d4 (diff)
downloadpfsense-packages-afb2683350af9c66cf6708955f2af3016633c41b.tar.gz
pfsense-packages-afb2683350af9c66cf6708955f2af3016633c41b.tar.bz2
pfsense-packages-afb2683350af9c66cf6708955f2af3016633c41b.zip
apcupsd - fix lock file when using usb devices
-rw-r--r--config/apcupsd/apcupsd.inc3
-rw-r--r--config/apcupsd/apcupsd.xml2
-rw-r--r--pkg_config.10.xml2
-rw-r--r--pkg_config.8.xml2
-rw-r--r--pkg_config.8.xml.amd642
5 files changed, 7 insertions, 4 deletions
diff --git a/config/apcupsd/apcupsd.inc b/config/apcupsd/apcupsd.inc
index a2b8d2ff..95abeca8 100644
--- a/config/apcupsd/apcupsd.inc
+++ b/config/apcupsd/apcupsd.inc
@@ -163,6 +163,9 @@ function sync_package_apcupsd(){
$apcupsd_rcfile="/usr/local/etc/rc.d/apcupsd.sh";
if (is_array($apcupsd_config) && $apcupsd_config['apcupsdenabled']=="on"){
$apcupsd_start = "echo \"Starting APC UPS Daemon...\"\n";
+ $apcupsd_start .= " if [ -f /var/spool/lock/LCK.. ]; then \n";
+ $apcupsd_start .= " /bin/rm -f /var/spool/lock/LCK.. \n";
+ $apcupsd_start .= " fi \n";
if ($apcupsd_config['killonpowerfail']=="on"){
$apcupsd_start .= " " . APCUPSD_BASE . "/sbin/apcupsd --kill-on-powerfail";
}else{
diff --git a/config/apcupsd/apcupsd.xml b/config/apcupsd/apcupsd.xml
index e69344fc..f9003a61 100644
--- a/config/apcupsd/apcupsd.xml
+++ b/config/apcupsd/apcupsd.xml
@@ -40,7 +40,7 @@
<name>Apcupsd</name>
<title>Services: Apcupsd (General)</title>
<category>Monitoring</category>
- <version>0.2</version>
+ <version>0.3</version>
<include_file>/usr/local/pkg/apcupsd.inc</include_file>
<addedit_string>Apcupsd has been created/modified.</addedit_string>
<delete_string>Apcupsd has been deleted.</delete_string>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 869c2fe4..159223e1 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1534,7 +1534,7 @@
<descr>Set of programs for controlling APC UPS.</descr>
<category>Services</category>
<config_file>https://packages.pfsense.org/packages/config/apcupsd/apcupsd.xml</config_file>
- <version>apcupsd-3.14.10_1 pkg v0.2</version>
+ <version>apcupsd-3.14.10_1 pkg v0.3</version>
<status>BETA</status>
<required_version>2.2</required_version>
<configurationfile>apcupsd.xml</configurationfile>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 6105f136..21d86ea5 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1981,7 +1981,7 @@
<descr>Set of programs for controlling APC UPS.</descr>
<category>Services</category>
<config_file>https://packages.pfsense.org/packages/config/apcupsd/apcupsd.xml</config_file>
- <version>apcupsd-3.14.10_1 pkg v0.2</version>
+ <version>apcupsd-3.14.10_1 pkg v0.3</version>
<status>BETA</status>
<required_version>2.0</required_version>
<configurationfile>apcupsd.xml</configurationfile>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 404d0967..8199d94c 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1968,7 +1968,7 @@
<descr>Set of programs for controlling APC UPS.</descr>
<category>Services</category>
<config_file>https://packages.pfsense.org/packages/config/apcupsd/apcupsd.xml</config_file>
- <version>apcupsd-3.14.10_1 pkg v0.2</version>
+ <version>apcupsd-3.14.10_1 pkg v0.3</version>
<status>BETA</status>
<required_version>2.0</required_version>
<configurationfile>apcupsd.xml</configurationfile>