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.

3 files changed, 10 insertions, 13 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
+?>
diff --git a/etc/rc.bootup b/etc/rc.bootup
index b7a632e..6cff6ac 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -129,7 +129,7 @@ $memory = get_memory();
 $avail = $memory[0];
 echo " done.\n";
 
-conf_mount_rw(true);
+conf_mount_rw();
 
 /* save dmesg output to file */
 system_dmesg_save();
@@ -400,6 +400,6 @@ unset($g['booting']);
 
 led_normalize();
 
-conf_mount_ro(true);
+conf_mount_ro();
 
 ?>
diff --git a/etc/sshd b/etc/sshd
index 67fbe00..28c8e55 100755
--- a/etc/sshd
+++ b/etc/sshd
@@ -42,7 +42,7 @@
 		exit;
 	}
 
-	conf_mount_rw(true);
+	conf_mount_rw();
 
 	function file_size($file) {
 	  $size = filesize($file);
@@ -138,7 +138,7 @@
 
 	/* are we already running?  if so exit */
 	if(is_subsystem_dirty('sshdkeys')) {
-		conf_mount_ro(true);
+		conf_mount_ro();
 		exit;
 	}
 	
@@ -185,6 +185,6 @@
 			exec("mkdir /conf/sshd");
 		exec("/bin/cp -p /etc/ssh/ssh_host* /conf/sshd");
 	}
-	conf_mount_ro(true);
+	conf_mount_ro();
 
 ?>