luci-0.9: merge r5407#

diff --git a/contrib/package/remote-update/Makefile b/contrib/package/remote-update/Makefile
index 40cee4c333b0732fe1a51c96ad3aa40ecd16147a..f4affb496aa8e24e9aac7d2cda3f46fbab0a2fa4 100644 (file)
--- a/contrib/package/remote-update/Makefile
+++ b/contrib/package/remote-update/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=remote-update
-PKG_RELEASE:=1
+PKG_RELEASE:=3
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 

diff --git a/contrib/package/remote-update/files/usr/sbin/remote-update b/contrib/package/remote-update/files/usr/sbin/remote-update
index bffc449d0838177614251eb3d9dd494729611270..192366d77a0e8d2bdf9f73ed50d93fb78207ca1c 100755 (executable)
--- a/contrib/package/remote-update/files/usr/sbin/remote-update
+++ b/contrib/package/remote-update/files/usr/sbin/remote-update
@@ -16,16 +16,10 @@ find_image()
 {
        case "$1" in
                atheros)
-                       if grep -q '"vmlinux.bin.l7"' /proc/mtd; then
-                               echo "openwrt-fonera-combined.img"
-                       else
-                               echo "openwrt-ubiquity-combined.img"
-                       fi
+                       echo "openwrt-atheros-combined.img"
                ;;
                ar71xx)
-                       if grep -q '"kernel"' /proc/mtd; then
-                               echo "openwrt-ar71xx-combined.img"
-                       fi
+                       echo "openwrt-ar71xx-combined.img"
                ;;
                brcm-2.4)
                        echo "openwrt-brcm-2.4-squashfs.trx"