fng-install: Fix get partition number function to return 0 for p1

recipes-bsp/fng-install/common/fnginstall-common.sh

@@ -1198,13 +1198,22 @@ get_partition_bootable()
     return 1
 }
 
+#=============================
+# Returns the number of the partition by name pattern
+# Working on /dev/mmclkYpX: p1 is 0, p2 is 1 ...
+#  TODO adapt for sda1 sdb2 ...
 #=============================
 get_partition_number()
 {
     __number="$1"
     out=${2#/dev/}
-    out=${out#*p}
+    if string_begins_with "$out" "mmcblk";then
+        out=${out#*p} # get the last number of mmcblk0pX
+    else
+        return 1;
+    fi
     is_number "$out" || return 1
+    out=$(( out - 1 ))
     eval "$__number=$out"
     return 0
 }
@@ -1229,8 +1238,7 @@ dont_keep_partition()
         KEEP_PARTITIONS_CNT=$PARTITION_COUNT
     fi
     get_partition_number num "$1" || return
-    keep=$(( num - 1 ))
-    if [ "$keep" -lt "$KEEP_PARTITIONS_CNT" ];then
+    if [ "$num" -lt "$KEEP_PARTITIONS_CNT" ];then
         KEEP_PARTITIONS_CNT="$keep"
     fi
 }

recipes-bsp/fng-install/fng-install-fngsystem/fngsystem-self-update.sh

@@ -232,7 +232,7 @@ if ! $REPARTITION_NEEDED;then
 
     if ! $REPARTITION_NEEDED && [ -n "$TARGET_PARTITION" ];then
         get_partition_number TARGET_PARTITION_NO "$TARGET_PARTITION"
-        if [ "$TARGET_PARTITION_NO" -gt "$KEEP_PARTITIONS_CNT" ];then
+        if [ "$TARGET_PARTITION_NO" -ge "$KEEP_PARTITIONS_CNT" ];then
             # format if TARGET partition gets recreated
             FORMAT_PARTITIONS=true
         fi