aboutsummaryrefslogtreecommitdiffstats
path: root/package/block-mount
diff options
context:
space:
mode:
authorDaniel Dickinson <crazycshore@gmail.com>2010-06-30 23:09:13 +0000
committerDaniel Dickinson <crazycshore@gmail.com>2010-06-30 23:09:13 +0000
commitd9e8e8b4ec955574027619b4cd7ba728d360bf86 (patch)
treec6481206125da7b97b80de35a1ea940b2a20c1af /package/block-mount
parent5f895af9fb2a65c6e51ac0e6e6085cf95ae9d1b9 (diff)
downloadupstream-d9e8e8b4ec955574027619b4cd7ba728d360bf86.tar.gz
upstream-d9e8e8b4ec955574027619b4cd7ba728d360bf86.tar.bz2
upstream-d9e8e8b4ec955574027619b4cd7ba728d360bf86.zip
block-extroot, block-mount: Fixed multiple bugs which prevented e2fsck from being executed on the external root filesystem before mounting it as root. Added /etc/e2fsck.conf which indicates that the clock is broken (since most OpenWRT devices don't have a battery backed RTC) so that e2fsck will not exit with fatal error when the rdat has not yet been run (i.e. before network).
SVN-Revision: 22002
Diffstat (limited to 'package/block-mount')
-rw-r--r--package/block-mount/files/fsck.sh24
-rw-r--r--package/block-mount/files/mount.sh4
2 files changed, 12 insertions, 16 deletions
diff --git a/package/block-mount/files/fsck.sh b/package/block-mount/files/fsck.sh
index d80e71693e..2b64025635 100644
--- a/package/block-mount/files/fsck.sh
+++ b/package/block-mount/files/fsck.sh
@@ -12,20 +12,18 @@ libmount_fsck() {
local found_fsck=0
- [ -n "$fsck_type" ] && [ "$fsck_type" != "swap" ] && {
- grep -q "$device" /proc/swaps || grep -q "$device" /proc/mounts || {
- [ -e "$device" ] && [ "$fsck_enabled" -eq 1 ] && {
- for known_type in $libmount_known_fsck; do
- if [ "$known_type" = "$fsck_fstype" ]; then
- fsck_${known_type} "$device"
- found_fsck=1
- break
- fi
- done
- if [ "$found_fsck" -ne 1 ]; then
- logger -t 'fstab' "Unable to check/repair $device; no known fsck for filesystem type $fstype"
+ grep -q "$device" /proc/swaps || grep -q "$device" /proc/mounts || {
+ [ -e "$device" ] && [ "$fsck_enabled" -eq 1 ] && {
+ for known_type in $libmount_known_fsck; do
+ if [ "$known_type" = "$fsck_fstype" ]; then
+ fsck_${known_type} "$device"
+ found_fsck=1
+ break
fi
- }
+ done
+ if [ "$found_fsck" -ne 1 ]; then
+ logger -t 'fstab' "Unable to check/repair $device; no known fsck for filesystem type $fstype"
+ fi
}
}
}
diff --git a/package/block-mount/files/mount.sh b/package/block-mount/files/mount.sh
index 1616ca7a13..db0fbad1ab 100644
--- a/package/block-mount/files/mount.sh
+++ b/package/block-mount/files/mount.sh
@@ -28,14 +28,13 @@ config_mount_by_section() {
local is_rootfs="$9"
shift
local found_device=""
- local fsck_type=""
found_device="$(libmount_find_device_by_id "$uuid" "$label" "$device" "$cfgdevice")"
if [ -n "$found_device" ]; then
if [ -z "$find_rootfs" ] || [ "$find_rootfs" -eq 0 ] || [ "$is_rootfs" -eq 1 ]; then
[ "$enabled_fsck" -eq 1 ] && {
grep -q "$found_device" /proc/swaps || grep -q "$found_device" /proc/mounts || {
- libmount_fsck "$found_device" "$fsck_type" "$enabled_fsck"
+ libmount_fsck "$found_device" "$fstype" "$enabled_fsck"
}
}
@@ -72,7 +71,6 @@ config_swapon_by_section() {
local label
local found_device=""
- local fsck_type=""
found_device="$(libmount_find_device_by_id "$uuid" "$label" "$device" "$cfgdevice")"