diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2005-09-05 17:43:39 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2005-09-05 17:43:39 +0000 |
| commit | 1ef6e981a334ebdb15cc1e6fd8b035a4f910e631 (patch) | |
| tree | e33e7bd0a49496e0942ffe3f814c1aabaa554e08 /etc/inc | |
| parent | beeef1f0f77f5b83a8bad0ea61b90e2a08a7235a (diff) | |
| download | pfsense-1ef6e981a334ebdb15cc1e6fd8b035a4f910e631.zip pfsense-1ef6e981a334ebdb15cc1e6fd8b035a4f910e631.tar.gz | |
Restore previous behavior. /tmp and /var will not be writable.
Diffstat (limited to 'etc/inc')
| -rw-r--r-- | etc/inc/config.inc | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc index e397a2a..8d1fb67 100644 --- a/etc/inc/config.inc +++ b/etc/inc/config.inc @@ -293,13 +293,15 @@ function conf_mount_rw() { /* if the platform is soekris or wrap or pfSense, lets mount the * compact flash cards root. */ - mwexec("/sbin/umount -f /"); - $status = mwexec("/sbin/mount -w /"); - /* we could not mount this correctly. kick off fsck */ - while($status < 0) { - log_error("File system is dirty. Launching FSCK for /"); - mwexec("/sbin/fsck -y"); + if($g['platform'] == "wrap" or $g['platform'] == "net45xx") { + mwexec("/sbin/umount -f /"); $status = mwexec("/sbin/mount -w /"); + /* we could not mount this correctly. kick off fsck */ + while($status < 0) { + log_error("File system is dirty. Launching FSCK for /"); + mwexec("/sbin/fsck -y"); + $status = mwexec("/sbin/mount -w /"); + } } } @@ -317,17 +319,16 @@ function conf_mount_ro() { /* do not umount on cdrom platform */ if($g['platform'] == "cdrom") return; - - if(file_exists("/tmp/ro_root_mount")) - return; 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. */ - mwexec("/sbin/umount -f /"); - mwexec("/sbin/mount -f -r /"); + if($g['platform'] == "wrap" or $g['platform'] == "net45xx") { + mwexec("/sbin/umount -f /"); + mwexec("/sbin/mount -f -r /"); + } } /****f* config/convert_config |
