Remove explicit filesystem argument to mount.
authorErnest Borowski <e.borowski@samsung.com>
Fri, 22 Jan 2021 13:55:28 +0000 (13:55 +0000)
committerErnest Borowski <e.borowski@samsung.com>
Tue, 13 Apr 2021 15:17:26 +0000 (15:17 +0000)
This allows to use this scripts with other filesystems such as btrfs.

Change-Id: I0f145b13548296b35d3138a2a0afe88de890546e

mk_delta/common/bin/mk_delta.sh
mk_delta/common/bin/mk_part_delta.sh

index 260490a..14e3a06 100755 (executable)
@@ -240,7 +240,7 @@ fn_extract_from_image()
                return 1;
        fi
 
-       sudo mount -t ext4 -o loop ${IMAGE} ${MNT_PNT}
+       sudo mount -o loop ${IMAGE} ${MNT_PNT}
        if [ "$?" != "0" ]; then
                return 1;
        fi
index d5687dc..a6366e7 100755 (executable)
@@ -277,11 +277,11 @@ fn_mk_delta_fs_core()
 
        #---- mount partition image to mount point  ----
        echo "mount ${PART_IMG_OLD} & ${PART_IMG_NEW}"
-       sudo mount -t ${FS} -o loop ${PART_IMG_OLD} ${MNT_PNT_OLD}
+       sudo mount -o loop ${PART_IMG_OLD} ${MNT_PNT_OLD}
        if [ "$?" != "0" ]; then
                return 1;
        fi
-       sudo mount -t ${FS} -o loop ${PART_IMG_NEW} ${MNT_PNT_NEW}
+       sudo mount -o loop ${PART_IMG_NEW} ${MNT_PNT_NEW}
        if [ "$?" != "0" ]; then
                return 1;
        fi
@@ -360,13 +360,13 @@ fn_mk_delta_fs()
                mkdir -p ${TMP_MNT_PNT}
 
                tar xvf ${OLD_TAR_DIR}/${OLD_TAR_FILE} ${PART_IMG_ORG}
-               sudo mount -t ext4 -o loop ${PART_IMG_ORG} ${TMP_MNT_PNT}
+               sudo mount -o loop ${PART_IMG_ORG} ${TMP_MNT_PNT}
                local OLD_BUILD_STRING=`cat ${TMP_MNT_PNT}/etc/info.ini | grep "Build=" | sed "s/Build=//" | sed "s/;$//"`
                sudo umount ${TMP_MNT_PNT}
                rm -rf ${PART_IMG_ORG}
 
                tar xvf ${NEW_TAR_DIR}/${NEW_TAR_FILE} ${PART_IMG_ORG}
-               sudo mount -t ext4 -o loop ${PART_IMG_ORG} ${TMP_MNT_PNT}
+               sudo mount -o loop ${PART_IMG_ORG} ${TMP_MNT_PNT}
                local NEW_BUILD_STRING=`cat ${TMP_MNT_PNT}/etc/info.ini | grep "Build=" | sed "s/Build=//" | sed "s/;$//"`
                sudo umount ${TMP_MNT_PNT}
                rm -rf ${PART_IMG_ORG}