From 1d6a017c29d5eff99209fa79bb76e916830c6c27 Mon Sep 17 00:00:00 2001 From: Yi Sun Date: Wed, 30 Sep 2009 11:46:48 -0700 Subject: [PATCH] add vold support --- initrd/scripts/2-mount | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/initrd/scripts/2-mount b/initrd/scripts/2-mount index 447514e..ded1c0d 100644 --- a/initrd/scripts/2-mount +++ b/initrd/scripts/2-mount @@ -26,19 +26,22 @@ mount_sdcard() { mountpoint -q sdcard && return if [ -n "$SDCARD" ]; then - [ -b "$SDCARD" ] && SDCARD=`echo $SDCARD | sed "s|/dev/||g"` - if [ -b "/dev/$SDCARD" ]; then + sed -i "s|\(EXTERNAL_STORAGE_STATE \) .*|\1 mounted|g" init.rc + if [ -b "$SDCARD" ]; then + mount $SDCARD sdcard + elif [ -b "/dev/$SDCARD" ]; then mount /dev/$SDCARD sdcard - else - sed -i "s|\(EXTERNAL_STORAGE_STATE\) mounted|\1 unmounted|g" init.rc - fi - sed -i "s|\(^ *block_device *\)\(/dev/.*\)|\1/dev/block/$SDCARD|g" mountd.conf - else - if [ -d /mnt/$SRC/sdcard ]; then + elif [ "$SDCARD" = "premount" ]; then + if [ -d /mnt/$SRC/sdcard ]; then mount -o remount,rw /mnt mount --bind /mnt/$SRC/sdcard sdcard - else + else mount -t tmpfs tmpfs sdcard + fi + else + sed -i "s|\(EXTERNAL_STORAGE_STATE \) .*|\1 unmounted|g" init.rc fi + else + sed -i "s|\(EXTERNAL_STORAGE_STATE \) .*|\1 unmounted|g" init.rc fi } -- 2.11.0