summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2008-11-23 06:18:42 +0000
committerScott Ullrich <sullrich@pfsense.org>2008-11-23 06:18:42 +0000
commitebc9d78413c9e97fe15441b289b0fbee43204f92 (patch)
tree300335013017c14e78c4b459065251c9a7bc530a
parent3c9b290cfe52b8cb5a32d47578a7680b8925784b (diff)
downloadpfsense-ebc9d78413c9e97fe15441b289b0fbee43204f92.zip
pfsense-ebc9d78413c9e97fe15441b289b0fbee43204f92.tar.gz
Update firmware lock (upgrade) variable
-rw-r--r--etc/inc/config.inc6
1 files changed, 1 insertions, 5 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index 656f5ff..596b6d1 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -468,7 +468,7 @@ function conf_mount_ro() {
return;
/* firmare upgrade in progress */
- if(file_exists($g['varrun_path'] . "/fwup.enabled"))
+ if(file_exists($g['varrun_path'] . "/firmware.lock"))
return;
/* do not umount if generating ssh keys */
@@ -479,10 +479,6 @@ 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']}");
OpenPOWER on IntegriCloud