Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pfSense-pkg-apcupsd - Remove useless conf_mount_{ro,rw} calls, add missing includes #458

Closed
wants to merge 3 commits into from
Closed

pfSense-pkg-apcupsd - Remove useless conf_mount_{ro,rw} calls, add missing includes #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
32f86c4
Remove useless conf_mount_{ro,rw} calls, add missing includes
doktornotor Oct 21, 2017
e732f1f
Bump port revision
doktornotor Oct 21, 2017
1ba1951
Use require_once()
doktornotor Oct 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sysutils/pfSense-pkg-apcupsd/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

PORTNAME= pfSense-pkg-apcupsd
PORTVERSION= 0.3.9
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= sysutils
MASTER_SITES= # empty
DISTFILES= # empty
Expand Down
9 changes: 4 additions & 5 deletions sysutils/pfSense-pkg-apcupsd/files/usr/local/pkg/apcupsd.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@
* limitations under the License.
*/

require_once("util.inc");
require_once("config.inc");
require_once("functions.inc");
require_once("pkg-utils.inc");
require_once("globals.inc");
require_once("pkg-utils.inc");
require_once("service-utils.inc");
require_once("util.inc");

function php_install_apcupsd() {
sync_package_apcupsd();
Expand Down Expand Up @@ -115,8 +117,6 @@ function validate_input_apcupsd($post, &$input_errors) {
function sync_package_apcupsd() {
global $config, $g;

conf_mount_rw();

if (is_service_running('apcupsd') && !file_exists("{$g['tmp_path']}/.rc.start_packages.running")) {
log_error("Stopping service apcupsd");
stop_service('apcupsd');
Expand Down Expand Up @@ -193,7 +193,6 @@ function sync_package_apcupsd() {
}
}

conf_mount_ro();
}

function apccontrol_scripts_install($emailnotification,$shutdownbehavior) {
Expand Down
2 changes: 1 addition & 1 deletion sysutils/pfSense-pkg-apcupsd/files/usr/local/www/apcupsd_status.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* limitations under the License.
*/

require("guiconfig.inc");
require_once("guiconfig.inc");
require_once("/usr/local/pkg/apcupsd.inc");

$pgtitle = array(gettext("Package"), gettext("Services: Apcupsd"), gettext("Status"));
Expand Down