luci-0.9: merge r4894

diff --git a/contrib/package/sysupgrade-atheros/Makefile b/contrib/package/sysupgrade-atheros/Makefile
index 7b20d8537b48e16cd7a2921d5509c694fd8e1c04..1a76c02d4d2bf26ced1a7fab2275304cc161d26e 100644 (file)
--- a/contrib/package/sysupgrade-atheros/Makefile
+++ b/contrib/package/sysupgrade-atheros/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sysupgrade-atheros
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 

diff --git a/contrib/package/sysupgrade-atheros/files/lib/upgrade/platform.sh b/contrib/package/sysupgrade-atheros/files/lib/upgrade/platform.sh
index 87a324810432ca9f45fdefcb3a5478c8c1ad4227..2a8c31def9ffc3f8770c240a058b6ac9c2ec42b2 100644 (file)
--- a/contrib/package/sysupgrade-atheros/files/lib/upgrade/platform.sh
+++ b/contrib/package/sysupgrade-atheros/files/lib/upgrade/platform.sh
@@ -3,7 +3,17 @@ platform_check_image() {
 
        case "$(get_magic_word "$1")" in
                # Freifunk .img files
-               4646) return 0;;
+               4646)
+                       local kern_name=$(dd if="$1" bs=2 skip=5 count=8 2>/dev/null); kern_name="${kern_name%% *}"
+                       local root_name=$(dd if="$1" bs=2 skip=17 count=8 2>/dev/null); root_name="${root_name%% *}"
+
+                       if grep -q '"'$kern_name'"' /proc/mtd && grep -q '"'$root_name'"' /proc/mtd; then
+                               return 0
+                       else
+                               echo "Invalid image. Missing the '$kern_name' or '$root_name' partition"
+                               return 1
+                       fi
+               ;;
                *)
                        echo "Invalid image. Use Freifunk .img files on this platform"
                        return 1
@@ -17,16 +27,18 @@ platform_do_upgrade() {
        local root_length=$((0x$(dd if="$1" bs=2 skip=13 count=4 2>/dev/null)/65536))
        local root_name=$(dd if="$1" bs=2 skip=17 count=8 2>/dev/null); root_name="${root_name%% *}"
 
-       local append=""
-       [ -f "$CONF_TAR" -a "$SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR"
+       if grep -q '"'$kern_name'"' /proc/mtd && grep -q '"'$root_name'"' /proc/mtd; then
+               local append=""
+               [ -f "$CONF_TAR" -a "$SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR"
 
-       if [ -n "$kern_name" -a -n "$root_name" ] && \
-          [ ${kern_length:-0} -gt 0 -a ${root_length:-0} -gt ${kern_length:-0} ];
-       then
-               dd if="$1" bs=65536 skip=1 count=$kern_length 2>/dev/null | \
-                       mtd -e $kern_name write - $kern_name
+               if [ -n "$kern_name" -a -n "$root_name" ] && \
+                  [ ${kern_length:-0} -gt 0 -a ${root_length:-0} -gt ${kern_length:-0} ];
+               then
+                       dd if="$1" bs=65536 skip=1 count=$kern_length 2>/dev/null | \
+                               mtd -e $kern_name write - $kern_name
 
-               dd if="$1" bs=65536 skip=$((1+$kern_length)) count=$root_length 2>/dev/null | \
-                       mtd -e $root_name $append write - $root_name
+                       dd if="$1" bs=65536 skip=$((1+$kern_length)) count=$root_length 2>/dev/null | \
+                               mtd -e $root_name $append write - $root_name
+               fi
        fi
 }