diff options
| author | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-06-20 08:50:19 -0300 |
|---|---|---|
| committer | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-06-20 08:50:19 -0300 |
| commit | f0b17f3f7226f819c94dfab4c9abc0f3e4962152 (patch) | |
| tree | 3118cd18bd89dd64cf991c1023099d63593ecedd /etc/inc/config.lib.inc | |
| parent | d8012adbce60d9a90dac54e5b7832f8fa7e82fb6 (diff) | |
| parent | 3745f21e2a9ccac1dadf78864ef65f2318ac919c (diff) | |
| download | pfsense-f0b17f3f7226f819c94dfab4c9abc0f3e4962152.zip pfsense-f0b17f3f7226f819c94dfab4c9abc0f3e4962152.tar.gz | |
Merge remote-tracking branch 'mainline/master' into inc
Diffstat (limited to 'etc/inc/config.lib.inc')
| -rw-r--r-- | etc/inc/config.lib.inc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/etc/inc/config.lib.inc b/etc/inc/config.lib.inc index 7232d14..d5e0f62 100644 --- a/etc/inc/config.lib.inc +++ b/etc/inc/config.lib.inc @@ -342,8 +342,10 @@ function conf_mount_rw() { function conf_mount_ro() { global $g; + /* Do not trust $g['platform'] since this can be clobbered during factory reset. */ + $platform = trim(file_get_contents("/etc/platform")); /* do not umount on cdrom or pfSense platforms */ - if($g['platform'] == "cdrom" or $g['platform'] == "pfSense") + if($platform == "cdrom" or $platform == "pfSense") return; if($g['booting']) |
