scripts: ubinize-image.sh: fix support for static volume
authorDaniel Golle <daniel@makrotopia.org>
Tue, 23 Apr 2024 10:39:34 +0000 (11:39 +0100)
committerDaniel Golle <daniel@makrotopia.org>
Wed, 24 Apr 2024 01:32:22 +0000 (02:32 +0100)
Apart from being misspelled ('dymamic' vs. 'dynamic') and a mismatch of
the number of parameters, there is also simply no need to add the 'dynamic'
volume type keyword as 6th parameter as that's the default anyway.
Fix and simplify the ubinize-image.sh script to work as intended.

Fixes: 6c17d71973 ("scripts: ubinize-image.sh: support static volumes, make size optional")
Reported-by: Hannu Nyman <hannu.nyman@iki.fi>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
scripts/ubinize-image.sh

index 06a6310980177a7104b067de5cb9becd06aa432b..d8b8cd3ae2ceb0a8261fc0a09738a0997769fc2c 100755 (executable)
@@ -90,10 +90,10 @@ ubilayout() {
                        rootsize="$( round_up "$( stat -c%s "$2" )" 1024 )"
                        ;;
                esac
-               ubivol $vol_id rootfs "$2" "$autoresize" "$rootsize" dynamic
+               ubivol $vol_id rootfs "$2" "$autoresize" "$rootsize"
 
                vol_id=$(( vol_id + 1 ))
-               [ "$rootfs_type" = "ubifs" ] || ubivol $vol_id rootfs_data "" 1 dymamic
+               [ "$rootfs_type" = "ubifs" ] || ubivol $vol_id rootfs_data "" 1
        fi
 }