summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2009-06-25 14:31:38 -0400
committerScott Ullrich <sullrich@pfsense.org>2009-06-25 14:31:38 -0400
commit7955cde8a5318090af78a6a22becb02d204f6591 (patch)
tree09bb7aa09a83262836fda31d3ce30ac8d1533b43 /etc
parent6e2365bbbdf4e4bc63c664dd09bc48b039bd5ed8 (diff)
downloadpfsense-7955cde8a5318090af78a6a22becb02d204f6591.zip
pfsense-7955cde8a5318090af78a6a22becb02d204f6591.tar.gz
Check to see if dir exists before blindly mounting rw
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/pkg-utils.inc7
1 files changed, 5 insertions, 2 deletions
diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc
index 3a79fb5..dfa37fe 100644
--- a/etc/inc/pkg-utils.inc
+++ b/etc/inc/pkg-utils.inc
@@ -39,15 +39,18 @@ require_once("pfsense-utils.inc");
require_once("globals.inc");
safe_mkdir("/var/db/pkg");
+
$g['platform'] = trim(file_get_contents("/etc/platform"));
if($g['platform'] == "pfSense") {
safe_mkdir("/usr/local/pkg");
safe_mkdir("/usr/local/pkg/pf");
} else {
+ if(!is_dir("/usr/local/pkg") or !is_dir("/usr/local/pkg/pf")) {
conf_mount_rw();
safe_mkdir("/usr/local/pkg");
- safe_mkdir("/usr/local/pkg/pf");
+ safe_mkdir("/usr/local/pkg/pf");
conf_mount_ro();
+ }
}
$version = split("-", trim(file_get_contents("/etc/version")));
@@ -1070,4 +1073,4 @@ function pkg_build_filter_rules() {
file_notice($error);
}
-?>
+?> \ No newline at end of file
OpenPOWER on IntegriCloud