bootable/newinstaller
| Revision | 2640cfd1efa050fb0108131f4cc917e846aaea39 (tree) |
|---|---|
| Time | 2009-10-16 12:41:51 |
| Author | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
2-mount: fix mount state bug and simplify the rules
initrd/scripts/2-mount (diff)| @@ -25,23 +25,22 @@ mount_data() | ||
| 25 | 25 | mount_sdcard() |
| 26 | 26 | { |
| 27 | 27 | mountpoint -q sdcard && return |
| 28 | - if [ -n "$SDCARD" ]; then | |
| 29 | - sed -i "s|\(EXTERNAL_STORAGE_STATE \) .*|\1 mounted|g" init.rc | |
| 30 | - if [ -b "$SDCARD" ]; then | |
| 31 | - mount $SDCARD sdcard | |
| 32 | - elif [ -b "/dev/$SDCARD" ]; then | |
| 33 | - mount /dev/$SDCARD sdcard | |
| 34 | - elif [ "$SDCARD" = "premount" ]; then | |
| 35 | - if [ -d /mnt/$SRC/sdcard ]; then | |
| 28 | + MOUNT_STATE=mounted | |
| 29 | + if [ -b "$SDCARD" ]; then | |
| 30 | + mount $SDCARD sdcard | |
| 31 | + elif [ -b "/dev/$SDCARD" ]; then | |
| 32 | + mount /dev/$SDCARD sdcard | |
| 33 | + elif [ "$SDCARD" = "premount" ]; then | |
| 34 | + if [ -d /mnt/$SRC/sdcard ]; then | |
| 36 | 35 | mount -o remount,rw /mnt |
| 37 | 36 | mount --bind /mnt/$SRC/sdcard sdcard |
| 38 | - else | |
| 39 | - mount -t tmpfs tmpfs sdcard | |
| 40 | - fi | |
| 37 | + elif [ -d data/sdcard ]; then | |
| 38 | + mount --bind data/sdcard sdcard | |
| 41 | 39 | else |
| 42 | - sed -i "s|\(EXTERNAL_STORAGE_STATE \) .*|\1 unmounted|g" init.rc | |
| 40 | + mount -t tmpfs tmpfs sdcard | |
| 43 | 41 | fi |
| 44 | 42 | else |
| 45 | - sed -i "s|\(EXTERNAL_STORAGE_STATE \) .*|\1 unmounted|g" init.rc | |
| 43 | + MOUNT_STATE=unmounted | |
| 46 | 44 | fi |
| 45 | + sed -i "s|\(EXTERNAL_STORAGE_STATE \).*|\1$MOUNT_STATE|g" init.rc | |
| 47 | 46 | } |
Fork