UBI-Utils: Updated scripts for latest UBI

Signed-off-by: Adrian Hunter <ext-adrian.hunter@nokia.com>

diff --git a/ubi-utils/scripts/ubi_test.sh b/ubi-utils/scripts/ubi_test.sh
index 8e62fb4594b03196f3639492649973436cf4124a..73e4b195f674ee29696b9914e4d1637c15f80e1c 100755 (executable)
--- a/ubi-utils/scripts/ubi_test.sh
+++ b/ubi-utils/scripts/ubi_test.sh
@@ -95,7 +95,7 @@ delete_volume ()
     volume=$1
 
     ### FIXME broken sysfs!!!!
-    if [ -e /sys/class/ubi/$volume -o -e /sys/class/ubi/ubi0/$volume ]; then
+    if [ -e /sys/class/ubi/$volume -o -e /sys/class/ubi/ubi0/$volume -o -e /sys/class/ubi/ubi0_$volume ]; then
 
        echo -n "*** Truncate volume if it exists ... "
        $UBIUPDATEVOL -d0 -n$volume -t
@@ -325,4 +325,4 @@ echo "*               Congratulations, no errors found!                     *"
 echo "*              Have fun with your cool UBI system!                    *"
 echo "***********************************************************************"
 
-exit_success
\ No newline at end of file
+exit_success

diff --git a/ubi-utils/scripts/ubi_tools_test.sh b/ubi-utils/scripts/ubi_tools_test.sh
index b4d167e76fcf433e87b17faeb03932c5b894366c..7f121f134db7d64df13d6b76c6611b6c7a1ce788 100755 (executable)
--- a/ubi-utils/scripts/ubi_tools_test.sh
+++ b/ubi-utils/scripts/ubi_tools_test.sh
@@ -96,7 +96,7 @@ delete_volume ()
     volume=$1
 
     ### FIXME broken sysfs!!!!
-    if [ -e /sys/class/ubi/$volume -o -e /sys/class/ubi/ubi0/$volume ]; then
+    if [ -e /sys/class/ubi/$volume -o -e /sys/class/ubi/ubi0/$volume -o -e /sys/class/ubi/ubi0_$volume ]; then
 
        echo -n "*** Truncate volume if it exists ... "
        $UBIWRITEVOL -d0 -n$volume -t
@@ -249,4 +249,4 @@ echo "*               Congratulations, no errors found!                     *"
 echo "*              Have fun with your cool UBI system!                    *"
 echo "***********************************************************************"
 
-exit_success
\ No newline at end of file
+exit_success