summaryrefslogtreecommitdiffstats
path: root/etc/inc/config.lib.inc
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2011-03-26 17:21:55 -0400
committerjim-p <jimp@pfsense.org>2011-03-26 17:21:55 -0400
commit63e18082bb98d51763e542d5c4094793b300eb60 (patch)
treeb180049ea306f8ff1a6091d4d3bd56aa8ad7964e /etc/inc/config.lib.inc
parentcd2c71fcf695d1bc82d6c6c1b25a9a68e8a5837a (diff)
downloadpfsense-63e18082bb98d51763e542d5c4094793b300eb60.zip
pfsense-63e18082bb98d51763e542d5c4094793b300eb60.tar.gz
Backing this out to see if it unbreaks NanoBSD upgrades with packages involved. Revert "Workaround for conf_mount_rw/ro during boot to only allow it to change at the start and end. Fixes #1279"
This reverts commit 548be1fd6697ab115cbb29d61bc5507744488094.
Diffstat (limited to 'etc/inc/config.lib.inc')
-rw-r--r--etc/inc/config.lib.inc13
1 files changed, 5 insertions, 8 deletions
diff --git a/etc/inc/config.lib.inc b/etc/inc/config.lib.inc
index 586d687..11e1ec3 100644
--- a/etc/inc/config.lib.inc
+++ b/etc/inc/config.lib.inc
@@ -301,16 +301,13 @@ EOD;
* null
******/
/* mount flash card read/write */
-function conf_mount_rw($nobootcheck = false) {
+function conf_mount_rw() {
global $g;
/* do not mount on cdrom platform */
if($g['platform'] == "cdrom" or $g['platform'] == "pfSense")
return;
- if($g['booting'] && !$nobootcheck)
- return;
-
if (refcount_reference(1000) > 1)
return;
@@ -324,7 +321,7 @@ function conf_mount_rw($nobootcheck = false) {
/* if the platform is soekris or wrap or pfSense, lets mount the
* compact flash cards root.
- */
+ */
$status = mwexec("/sbin/mount -u -w -o sync,noatime /");
/* we could not mount this correctly. kick off fsck */
if($status <> 0) {
@@ -342,14 +339,14 @@ function conf_mount_rw($nobootcheck = false) {
* RESULT
* null
******/
-function conf_mount_ro($nobootcheck = false) {
+function conf_mount_ro() {
global $g;
/* do not umount on cdrom or pfSense platforms */
if($g['platform'] == "cdrom" or $g['platform'] == "pfSense")
return;
- if($g['booting'] && !$nobootcheck)
+ if($g['booting'])
return;
if (refcount_unreference(1000) > 0)
@@ -855,4 +852,4 @@ function set_device_perms() {
}
}
-?> \ No newline at end of file
+?>
OpenPOWER on IntegriCloud