summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErmal LUÇI <eri@pfsense.org>2015-06-09 02:35:01 +0200
committerErmal LUÇI <eri@pfsense.org>2015-06-09 02:35:01 +0200
commitd32c16bcd454e4cdd160b448e591532cb4fde2c8 (patch)
treea3e12a17ec56579595d9b985d0ae37407298db23
parente14e38c12bd1d2adc02dd732e0dbb0bbd76fb6bc (diff)
downloadpfsense-d32c16bcd454e4cdd160b448e591532cb4fde2c8.zip
pfsense-d32c16bcd454e4cdd160b448e591532cb4fde2c8.tar.gz
Do not call fsck just out of nowhere here since it cannot be the problem or fix.
-rw-r--r--etc/inc/config.lib.inc10
1 files changed, 4 insertions, 6 deletions
diff --git a/etc/inc/config.lib.inc b/etc/inc/config.lib.inc
index ff0430e..29c8817 100644
--- a/etc/inc/config.lib.inc
+++ b/etc/inc/config.lib.inc
@@ -39,7 +39,7 @@
POSSIBILITY OF SUCH DAMAGE.
- pfSense_BUILDER_BINARIES: /sbin/mount /sbin/umount /sbin/halt /sbin/fsck
+ pfSense_BUILDER_BINARIES: /sbin/mount /sbin/umount /sbin/halt
pfSense_MODULE: config
*/
@@ -331,9 +331,8 @@ function conf_mount_rw() {
$status = mwexec("/sbin/mount -u -w -o sync,noatime {$g['cf_path']}");
if ($status <> 0) {
if (platform_booting()) {
- echo gettext("Disk is dirty. Running fsck -y") . "\n";
+ echo gettext("/cf Filesystem is dirty.") . "\n";
}
- mwexec("/sbin/fsck -y {$g['cf_path']}");
$status = mwexec("/sbin/mount -u -w -o sync,noatime {$g['cf_path']}");
}
@@ -341,10 +340,9 @@ function conf_mount_rw() {
* compact flash cards root.
*/
$status = mwexec("/sbin/mount -u -w -o sync,noatime /");
- /* we could not mount this correctly. kick off fsck */
+ /* we could not mount this correctly. */
if ($status <> 0) {
- log_error(gettext("File system is dirty. Launching FSCK for /"));
- mwexec("/sbin/fsck -y /");
+ log_error(gettext("/ File system is dirty."));
$status = mwexec("/sbin/mount -u -w -o sync,noatime /");
}
OpenPOWER on IntegriCloud