Allow upgrade of Tizen with dynamic partitions

This change adds support of dynamic partitions mapped from super
partition during upgrade.

Change-Id: I2bd8988646786af42ea20b55830a41a6e7cba97f

diff --git a/packaging/initrd-recovery.spec b/packaging/initrd-recovery.spec
index 5f45d36..dce8808 100644 (file)
--- a/packaging/initrd-recovery.spec
+++ b/packaging/initrd-recovery.spec
@@ -18,6 +18,7 @@ Requires: bash
 Requires: procps
 Requires: device-mapper
 Requires: verity-tools
+Requires: parse-dynparts
 
 %description
 This is a special booting mode and executes system recovery mode on user

diff --git a/src/bootmode-fota/40-fota.list.in b/src/bootmode-fota/40-fota.list.in
index cefb6da..aa5b07f 100644 (file)
--- a/src/bootmode-fota/40-fota.list.in
+++ b/src/bootmode-fota/40-fota.list.in
@@ -39,6 +39,7 @@ WITHLIBS="
 /usr/sbin/dmsetup
 /usr/sbin/bow-restore
 /usr/sbin/fstrim
+/usr/sbin/parse-dynparts
 "
 
 # LinkFileName:Target

diff --git a/src/bootmode-fota/fota-init.sh b/src/bootmode-fota/fota-init.sh
index 4954334..2c084b9 100755 (executable)
--- a/src/bootmode-fota/fota-init.sh
+++ b/src/bootmode-fota/fota-init.sh
@@ -31,6 +31,20 @@ do_reboot() {
        done
 }
 
+function map_from_super() {
+    local part_name="$1"
+    local part_table="$2"
+    echo "$part_table" | /usr/sbin/dmsetup create "$part_name" &>/dev/null
+    if [ $? = 0 ]
+    then
+        echo "/dev/mapper/$part_name"
+        return 0
+    else
+        echo "WARNING : SUPER FOUND BUT $part_name NOT FOUND" >&2
+        return 1
+    fi
+}
+
 #------------------------------------------------
 #       get partition id
 #------------------------------------------------
@@ -43,7 +57,33 @@ get_partition_id() {
         echo "Using A/B slot: ${P_SLOT}"
     fi
 
-    PART_ROOTFS=`/sbin/blkid -t PARTLABEL=rootfs${P_SUFFIX} -o device -l`
+    SUPERFS=`/sbin/blkid -t PARTLABEL=super -o device -l`
+    if [ x$SUPERFS = "x" ]
+    then
+        SUPERFS=`/sbin/blkid -t LABEL=super -o device -l`
+    fi
+
+    if [ x$SUPERFS != "x" ]
+    then
+        PARSE_DYNPARTS=`/usr/sbin/parse-dynparts "$SUPERFS" --list-tables`
+
+        while read -r part_name part_table; do
+            if [ "$part_name" = "rootfs${P_SUFFIX}" ]
+            then
+                PART_ROOTFS=`map_from_super "$part_name" "$part_table"`
+            fi
+
+            if [ "$part_name" = "hal${P_SUFFIX}" ]
+            then
+                PART_HAL=`map_from_super "$part_name" "$part_table"`
+            fi
+        done <<< "$PARSE_DYNPARTS"
+    fi
+
+    if [ x$PART_ROOTFS = "x" ]
+    then
+        PART_ROOTFS=`/sbin/blkid -t PARTLABEL=rootfs${P_SUFFIX} -o device -l`
+    fi
     if [ x$PART_ROOTFS = "x" ]
     then
         PART_ROOTFS=`/sbin/blkid -L rootfs`
@@ -61,7 +101,10 @@ get_partition_id() {
         PART_RAMDISK=`/sbin/blkid -L ramdisk`
     fi
 
-    PART_HAL=`/sbin/blkid -t PARTLABEL=hal${P_SUFFIX} -o device -l`
+    if [ x$HALFS = "x" ]
+    then
+        PART_HAL=`/sbin/blkid -t PARTLABEL=hal${P_SUFFIX} -o device -l`
+    fi
     if [ x$PART_HAL = "x" ]
     then
         PART_HAL=`/sbin/blkid -L hal`