From 0d2a8ae278580e32ef58ec01fcf1f916317ff344 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 20 May 2013 00:30:49 +0200 Subject: [PATCH] busybox-initramfs: add fsck for local disks, actually supported for ext2-4, vfat/msdos and hfs/hfs+ partitions Signed-off-by: Stephan Raue --- .../sysutils/busybox-initramfs/scripts/init | 29 ++----------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/packages/initramfs/sysutils/busybox-initramfs/scripts/init b/packages/initramfs/sysutils/busybox-initramfs/scripts/init index 8d545ebcc2..77f25cbaab 100755 --- a/packages/initramfs/sysutils/busybox-initramfs/scripts/init +++ b/packages/initramfs/sysutils/busybox-initramfs/scripts/init @@ -274,6 +274,8 @@ LABEL=*|UUID=*|/*) MOUNT_CMD="mount_common" MOUNT_TARGET="$1" + # check filesystem + /sbin/fsck -a $1 &>/dev/null ;; CIFS=*|SMB=*) MOUNT_CMD="mount_cifs" @@ -328,23 +330,6 @@ fi } - hfsdiskprep() { - for DEVICE in /dev/sd*; do - for device in $(/bin/busybox blkid $DEVICE); do - case $device in - TYPE=*) - FS_TYPE=${device#TYPE=} - ;; - esac - done - - if [ "$FS_TYPE" = "\"hfs\"" -o "$FS_TYPE" = "\"hfsplus\"" ]; then - progress "check filesystem $DEVICE [$FS_TYPE]..." - /bin/fsck_hfs -r -y $DEVICE >&$SILENT_OUT 2>&1 - fi - done - } - load_modules() { progress "Loading kernel modules" @@ -379,15 +364,6 @@ fi } - check_disks() { - progress "Checking disks" - - if [ -x /bin/fsck_hfs ]; then - # deal with hfs partitions - hfsdiskprep - fi - } - mount_flash() { progress "Mounting flash" @@ -589,7 +565,6 @@ # main boot sequence for BOOT_STEP in \ load_modules \ - check_disks \ mount_flash \ load_splash \ mount_storage \