summaryrefslogtreecommitdiffstats
path: root/etc/inc/config.inc
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2005-11-20 02:15:34 +0000
committerScott Ullrich <sullrich@pfsense.org>2005-11-20 02:15:34 +0000
commit1dc67b0425a1ae65115f189815db3dcf14e276c1 (patch)
tree1d73e25f995dfd3f629f025c7d466c01005d9f49 /etc/inc/config.inc
parent312710db15570fea11b9ade4e5e2248d85e9a138 (diff)
downloadpfsense-1dc67b0425a1ae65115f189815db3dcf14e276c1.zip
pfsense-1dc67b0425a1ae65115f189815db3dcf14e276c1.tar.gz
Do not fiddle with umounting on pfsense or cdrom platforms
Diffstat (limited to 'etc/inc/config.inc')
-rw-r--r--etc/inc/config.inc19
1 files changed, 6 insertions, 13 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index 2bd0a1a..50b9460 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -333,25 +333,18 @@ function conf_mount_ro() {
if(file_exists("/tmp/keys_generating"))
return;
- /* do not umount on cdrom platform */
- if($g['platform'] == "cdrom")
+ /* do not umount on cdrom or pfSense platforms */
+ if($g['platform'] == "cdrom" or $g['platform'] == "pfSense")
return;
/* sync data, then force a umount the remount of /cf */
mwexec("/bin/sync");
+ mwexec("/bin/sync");
mwexec("/sbin/umount -f {$g['cf_path']}");
mwexec("/sbin/mount -r {$g['cf_path']}");
-
- /* if the platform is soekris or wrap, lets unmount the
- * compact flash card.
- */
- if($g['platform'] == "wrap" or $g['platform'] == "net45xx"
- or $g['platform'] == "embedded") {
- mwexec("/bin/sync");
- mwexec("/bin/sync");
- mwexec("/bin/sync");
- mwexec("/sbin/mount -r /");
- }
+ mwexec("/bin/sync");
+ mwexec("/bin/sync");
+ mwexec("/sbin/mount -r /");
}
/****f* config/convert_config
OpenPOWER on IntegriCloud