[openwrt/openwrt] scripts: ubinize-image.sh: fix support for static volume

LEDE Commits lede-commits at lists.infradead.org
Wed Apr 24 03:15:11 PDT 2024


dangole pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/da13ff30efdb921fe22d02334432c578ba95996a

commit da13ff30efdb921fe22d02334432c578ba95996a
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Tue Apr 23 11:39:34 2024 +0100

    scripts: ubinize-image.sh: fix support for static volume
    
    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 at iki.fi>
    Signed-off-by: Daniel Golle <daniel at makrotopia.org>
---
 scripts/ubinize-image.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/ubinize-image.sh b/scripts/ubinize-image.sh
index 06a6310980..d8b8cd3ae2 100755
--- a/scripts/ubinize-image.sh
+++ b/scripts/ubinize-image.sh
@@ -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
 }
 




More information about the lede-commits mailing list