From 63e18082bb98d51763e542d5c4094793b300eb60 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Sat, 26 Mar 2011 17:21:55 -0400
Subject: 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.
---
 etc/inc/config.lib.inc | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'etc/inc/config.lib.inc')

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
+?>
-- 
cgit v1.1