From a88f57ec36d873d2c896e8c178c4bba2649f8d58 Mon Sep 17 00:00:00 2001 From: Amaury Pouly Date: Sun, 20 Nov 2016 21:35:37 +0100 Subject: 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 --- utils/nwztools/scripts/dump_rootfs.sh | 4 +++- utils/nwztools/scripts/install_dualboot.sh | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/utils/nwztools/scripts/dump_rootfs.sh b/utils/nwztools/scripts/dump_rootfs.sh index da20e43..36e521c 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." # 5) Dump the root filesystem # Mount the root filesystem read-only and dump it +# NOTE some platforms use ext4 with a custom mount program +# (/usr/local/bin/icx_mount.ext4), some probably use an mtd too lcdmsg -f /usr/local/bin/font_08x12.bmp -l 0,12 "Dumping rootfs..." ROOTFS_TMP_DIR=/tmp/rootfs mkdir $ROOTFS_TMP_DIR . /install_script/constant.txt -if ! mount -t ext2 -o ro $COMMON_ROOTFS_PARTITION $ROOTFS_TMP_DIR +if ! mount -t ext3 -o ro $COMMON_ROOTFS_PARTITION $ROOTFS_TMP_DIR then lcdmsg -f /usr/local/bin/font_08x12.bmp -l 0,13 "ERROR: cannot mount rootfs" else diff --git a/utils/nwztools/scripts/install_dualboot.sh b/utils/nwztools/scripts/install_dualboot.sh index 08c24b7..c134929 100644 --- a/utils/nwztools/scripts/install_dualboot.sh +++ b/utils/nwztools/scripts/install_dualboot.sh @@ -49,9 +49,9 @@ if [ "$?" != 0 ]; then exit 0 fi -# NOTE some platforms use ext3 and some ext4 with a custom mount program +# NOTE some platforms use ext4 with a custom mount program # (/usr/local/bin/icx_mount.ext4), some probably use an mtd too -mount -t ext2 $COMMON_ROOTFS_PARTITION $ROOTFS_TMP_DIR +mount -t ext3 $COMMON_ROOTFS_PARTITION $ROOTFS_TMP_DIR if [ "$?" != 0 ]; then lcdmsg -f /usr/local/bin/font_08x12.bmp -l 0,15 "ERROR: mount failed" sleep 3 -- cgit v1.1