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-nut - Remove useless conf_mount_{ro,rw} calls #463

Closed
wants to merge 4 commits into from
Closed

pfSense-pkg-nut - Remove useless conf_mount_{ro,rw} calls #463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe9c008
Remove useless conf_mount_{ro,rw} calls
doktornotor Oct 21, 2017
69965a2
Bump port revision
doktornotor Oct 21, 2017
a39ea94
Use require_once()
doktornotor Oct 21, 2017
2ca8a78
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-nut/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-nut
PORTVERSION= 2.7.4
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= sysutils
MASTER_SITES= # empty
DISTFILES= # empty
Expand Down
2 changes: 0 additions & 2 deletions sysutils/pfSense-pkg-nut/files/usr/local/pkg/nut/nut.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,6 @@ function nut_sync_config() {
$monfile .= "\n\n" . base64_decode($nut_config['upsmon_conf']) . "\n";
}

conf_mount_rw();
if (!empty($upsfile)) {
nut_write_file(NUT_UPSFILE, $upsfile);
} else {
Expand All @@ -273,7 +272,6 @@ function nut_sync_config() {
}
nut_write_file(NUT_MONFILE, $monfile);
nut_write_rcfile($driver);
conf_mount_ro();

if (platform_booting()) {
return;
Expand Down
4 changes: 2 additions & 2 deletions sysutils/pfSense-pkg-nut/files/usr/local/www/nut_settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
*/


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

if (!is_array($config['installedpackages']['nut']['config'])) {
$config['installedpackages']['nut']['config'] = array();
Expand Down
4 changes: 2 additions & 2 deletions sysutils/pfSense-pkg-nut/files/usr/local/www/nut_status.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
*/


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

function print_row($desc, $value) {
print '<tr>';
Expand Down