base-files: export whole disk of fitblk backing partition

After commit ad62247800 ("base-files: improve lib/upgrade/common.sh")
behavior of export_bootdevice has been made consistent in such way that
always the whole disk device is exported (as that was the case already
when matching via UUID) rather than the partition device.
Do the same for the device holding the fitblk backing partition.

Fixes: 5992f976b3 ("base-files: recognize bootdevice on devices using fitblk")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>

diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh
index 7e83379082e50f12104280e64eb5036232899fe6..ef8d01e16896f32bd2d75544f707d4497582fe88 100644 (file)
--- a/package/base-files/files/lib/upgrade/common.sh
+++ b/package/base-files/files/lib/upgrade/common.sh
@@ -213,11 +213,8 @@ export_bootdevice() {
                        done
                ;;
                /dev/*)
-                       if [ "$rootpart" = "/dev/fit0" ]; then
-                               uevent="/sys/class/block/$(fitblk_get_bootdev)/uevent"
-                       else
-                               uevent="/sys/class/block/${rootpart##*/}/../uevent"
-                       fi
+                       [ "$rootpart" = "/dev/fit0" ] && rootpart="$(fitblk_get_bootdev)"
+                       uevent="/sys/class/block/${rootpart##*/}/../uevent"
                ;;
                0x[a-f0-9][a-f0-9][a-f0-9] | 0x[a-f0-9][a-f0-9][a-f0-9][a-f0-9] | \
                [a-f0-9][a-f0-9][a-f0-9] | [a-f0-9][a-f0-9][a-f0-9][a-f0-9])