From 0aa65a5eb9584c9c2820c45704fb6de15c356bc9 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Sun, 23 Nov 2008 06:13:30 +0000
Subject: Do not allow ro mount when an upgrade is in progress

---
 etc/inc/config.inc | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index c99a8ea..e0872e4 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -518,6 +518,10 @@ function conf_mount_ro() {
 	if($g['platform'] == "cdrom" or $g['platform'] == "pfSense")
 		return;
 
+	/* If a firmware upgrade is in progress, do not mount ro */
+	if(file_exists($d_firmwarelock_path)) 
+		return;
+
 	/* sync data, then force a remount of /cf */
 	mwexec("/bin/sync");
 	mwexec("/sbin/mount -u -r -f {$g['cf_path']}");
-- 
cgit v1.1