ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-25 16:31:13 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

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).

Browse Source 
SVN-Revision: 22002
This commit is contained in:
Daniel Dickinson 2010-06-30 23:09:13 +00:00
parent 5f895af9fb
commit d9e8e8b4ec
5 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package/block-extroot/files/50_determine_usb_root
View File

@ -4,11 +4,11 @@
# See /LICENSE for more information. # See /LICENSE for more information.
. /etc/functions.sh
. /lib/functions/extmount.sh
. /lib/functions/mount.sh
determine_external_root() { determine_external_root() {
. /etc/functions.sh
. /lib/functions/extmount.sh
. /lib/functions/mount.sh
local OLD_UCI_CONFIG_DIR="$UCI_CONFIG_DIR" local OLD_UCI_CONFIG_DIR="$UCI_CONFIG_DIR"
set_jffs_mp set_jffs_mp
determine_root_device determine_root_device

24
package/block-mount/files/fsck.sh
View File

@ -12,20 +12,18 @@ libmount_fsck() {
local found_fsck=0 local found_fsck=0
[ -n "$fsck_type" ] && [ "$fsck_type" != "swap" ] && { grep -q "$device" /proc/swaps || grep -q "$device" /proc/mounts || {
grep -q "$device" /proc/swaps || grep -q "$device" /proc/mounts || { [ -e "$device" ] && [ "$fsck_enabled" -eq 1 ] && {
[ -e "$device" ] && [ "$fsck_enabled" -eq 1 ] && { for known_type in $libmount_known_fsck; do
for known_type in $libmount_known_fsck; do if [ "$known_type" = "$fsck_fstype" ]; then
if [ "$known_type" = "$fsck_fstype" ]; then fsck_${known_type} "$device"
fsck_${known_type} "$device" found_fsck=1
found_fsck=1 break
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 fi
} done
if [ "$found_fsck" -ne 1 ]; then
logger -t 'fstab' "Unable to check/repair $device; no known fsck for filesystem type $fstype"
fi
} }
} }
} }

4
package/block-mount/files/mount.sh
View File

@ -28,14 +28,13 @@ config_mount_by_section() {
local is_rootfs="$9" local is_rootfs="$9"
shift shift
local found_device="" local found_device=""
local fsck_type=""
found_device="$(libmount_find_device_by_id "$uuid" "$label" "$device" "$cfgdevice")" found_device="$(libmount_find_device_by_id "$uuid" "$label" "$device" "$cfgdevice")"
if [ -n "$found_device" ]; then if [ -n "$found_device" ]; then
if [ -z "$find_rootfs" ] || [ "$find_rootfs" -eq 0 ] || [ "$is_rootfs" -eq 1 ]; then if [ -z "$find_rootfs" ] || [ "$find_rootfs" -eq 0 ] || [ "$is_rootfs" -eq 1 ]; then
[ "$enabled_fsck" -eq 1 ] && { [ "$enabled_fsck" -eq 1 ] && {
grep -q "$found_device" /proc/swaps || grep -q "$found_device" /proc/mounts || { 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 label
local found_device="" local found_device=""
local fsck_type=""
found_device="$(libmount_find_device_by_id "$uuid" "$label" "$device" "$cfgdevice")" found_device="$(libmount_find_device_by_id "$uuid" "$label" "$device" "$cfgdevice")"

1
package/e2fsprogs/Makefile
View File

@ -158,6 +158,7 @@ define Package/e2fsprogs/install
$(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_DIR) $(1)/lib/functions/fsck $(INSTALL_DIR) $(1)/lib/functions/fsck
$(INSTALL_DATA) ./files/e2fsck.sh $(1)/lib/functions/fsck/ $(INSTALL_DATA) ./files/e2fsck.sh $(1)/lib/functions/fsck/
$(INSTALL_DATA) ./files/e2fsck.conf $(1)/etc/e2fsck.conf
endef endef
define Package/libuuid/install define Package/libuuid/install

3
package/e2fsprogs/files/e2fsck.conf Normal file
View File

@ -0,0 +1,3 @@
[options]
broken_system_clock = true