summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmaury Pouly <amaury.pouly@gmail.com>2016-11-20 21:35:37 +0100
committerAmaury Pouly <amaury.pouly@gmail.com>2016-11-20 21:36:54 +0100
commita88f57ec36d873d2c896e8c178c4bba2649f8d58 (patch)
tree0de31f01cac77e6493d17c4e6e7c02d93d07d0a7
parentce966d3d280f8475f18ee6b01af5829d12918344 (diff)
downloadrockbox-a88f57ec36d873d2c896e8c178c4bba2649f8d58.tar.gz
rockbox-a88f57ec36d873d2c896e8c178c4bba2649f8d58.zip
nwztools/scripts: mount storage with ext3 instead of ext2
Since ext3 supports ext2, we can support more platforms. Some platforms use ext4 with a very specific set of options, we I haven't encountered those yet so it's not currently a problem. Change-Id: Iff87e925a4caa866c6a66b1883ad6baab88c0b8d
-rw-r--r--utils/nwztools/scripts/dump_rootfs.sh4
-rw-r--r--utils/nwztools/scripts/install_dualboot.sh4
2 files changed, 5 insertions, 3 deletions
diff --git a/utils/nwztools/scripts/dump_rootfs.sh b/utils/nwztools/scripts/dump_rootfs.sh
index da20e43b41..36e521ce3b 100644
--- a/utils/nwztools/scripts/dump_rootfs.sh
+++ b/utils/nwztools/scripts/dump_rootfs.sh
@@ -60,11 +60,13 @@ lcdmsg -f /usr/local/bin/font_08x12.bmp -l 0,10 "Done."
60 60
61# 5) Dump the root filesystem 61# 5) Dump the root filesystem
62# Mount the root filesystem read-only and dump it 62# Mount the root filesystem read-only and dump it
63# NOTE some platforms use ext4 with a custom mount program
64# (/usr/local/bin/icx_mount.ext4), some probably use an mtd too
63lcdmsg -f /usr/local/bin/font_08x12.bmp -l 0,12 "Dumping rootfs..." 65lcdmsg -f /usr/local/bin/font_08x12.bmp -l 0,12 "Dumping rootfs..."
64ROOTFS_TMP_DIR=/tmp/rootfs 66ROOTFS_TMP_DIR=/tmp/rootfs
65mkdir $ROOTFS_TMP_DIR 67mkdir $ROOTFS_TMP_DIR
66. /install_script/constant.txt 68. /install_script/constant.txt
67if ! mount -t ext2 -o ro $COMMON_ROOTFS_PARTITION $ROOTFS_TMP_DIR 69if ! mount -t ext3 -o ro $COMMON_ROOTFS_PARTITION $ROOTFS_TMP_DIR
68then 70then
69 lcdmsg -f /usr/local/bin/font_08x12.bmp -l 0,13 "ERROR: cannot mount rootfs" 71 lcdmsg -f /usr/local/bin/font_08x12.bmp -l 0,13 "ERROR: cannot mount rootfs"
70else 72else
diff --git a/utils/nwztools/scripts/install_dualboot.sh b/utils/nwztools/scripts/install_dualboot.sh
index 08c24b7b5f..c134929312 100644
--- a/utils/nwztools/scripts/install_dualboot.sh
+++ b/utils/nwztools/scripts/install_dualboot.sh
@@ -49,9 +49,9 @@ if [ "$?" != 0 ]; then
49 exit 0 49 exit 0
50fi 50fi
51 51
52# NOTE some platforms use ext3 and some ext4 with a custom mount program 52# NOTE some platforms use ext4 with a custom mount program
53# (/usr/local/bin/icx_mount.ext4), some probably use an mtd too 53# (/usr/local/bin/icx_mount.ext4), some probably use an mtd too
54mount -t ext2 $COMMON_ROOTFS_PARTITION $ROOTFS_TMP_DIR 54mount -t ext3 $COMMON_ROOTFS_PARTITION $ROOTFS_TMP_DIR
55if [ "$?" != 0 ]; then 55if [ "$?" != 0 ]; then
56 lcdmsg -f /usr/local/bin/font_08x12.bmp -l 0,15 "ERROR: mount failed" 56 lcdmsg -f /usr/local/bin/font_08x12.bmp -l 0,15 "ERROR: mount failed"
57 sleep 3 57 sleep 3