diff --git a/package/gluon-autoupdater/Makefile b/package/gluon-autoupdater/Makefile index a885a0d0f623951ba5accc3367d2c87c3385de06..3e555a0bf6c23deed2d2aacc5d9e1b712f04984d 100644 --- a/package/gluon-autoupdater/Makefile +++ b/package/gluon-autoupdater/Makefile @@ -11,7 +11,7 @@ include $(GLUONDIR)/include/package.mk define Package/gluon-autoupdater SECTION:=gluon CATEGORY:=Gluon - DEPENDS:=+gluon-core +gluon-cron +opkg +ecdsautils +!BUSYBOX_CONFIG_SHA512SUM:coreutils-sha512sum + DEPENDS:=+gluon-core +gluon-cron +lua-platform-info +opkg +ecdsautils +!BUSYBOX_CONFIG_SHA512SUM:coreutils-sha512sum TITLE:=Automatically update firmware endef diff --git a/package/gluon-autoupdater/files/usr/sbin/autoupdater b/package/gluon-autoupdater/files/usr/sbin/autoupdater index cd61eb497289687b5401b625825c8c640d16ea31..0919f5ff9129834ccf7fd25b9f65f49afb22e42e 100755 --- a/package/gluon-autoupdater/files/usr/sbin/autoupdater +++ b/package/gluon-autoupdater/files/usr/sbin/autoupdater @@ -165,8 +165,7 @@ autoupdate() { trap 'echo Signal ignored.' INT TERM PIPE -. /lib/gluon/functions/model.sh -my_model="$(get_model | tr '[A-Z]' '[a-z]' | sed -r 's/[^a-z0-9]+/-/g;s/-$//')" +my_model="$(lua -e 'print(require("platform_info").get_image_name())')" if [ ! -f "$VERSION_FILE" ]; then echo "Couldn't determine firmware version!" >&2 diff --git a/package/gluon-setup-mode/Makefile b/package/gluon-setup-mode/Makefile index e8d4fe52555446d3cad1defb1c24fb9752ef4a8e..9fda3d9a4ebecd111d2de47f66769980647ae32e 100644 --- a/package/gluon-setup-mode/Makefile +++ b/package/gluon-setup-mode/Makefile @@ -14,7 +14,7 @@ define Package/gluon-setup-mode SECTION:=gluon CATEGORY:=Gluon TITLE:=Setup mode - DEPENDS:=+uhttpd +dnsmasq +ip + DEPENDS:=+gluon-core +lua-platform-info +uhttpd +dnsmasq +ip endef define Package/gluon-setup-mode/description diff --git a/package/gluon-setup-mode/files/lib/gluon/upgrade/setup-mode/invariant/011-setup-ifname b/package/gluon-setup-mode/files/lib/gluon/upgrade/setup-mode/invariant/011-setup-ifname index f9f33a701d0573b03f7b3d520d583e1fa44c5695..29757cddd67cee514928df47c9a6dbd8a8ac6026 100755 --- a/package/gluon-setup-mode/files/lib/gluon/upgrade/setup-mode/invariant/011-setup-ifname +++ b/package/gluon-setup-mode/files/lib/gluon/upgrade/setup-mode/invariant/011-setup-ifname @@ -1,20 +1,18 @@ -#!/bin/sh +#!/usr/bin/lua -. /lib/gluon/functions/sysconfig.sh -. /lib/gluon/functions/model.sh +local platform_info = require 'platform_info' +local sysconfig = require 'gluon.sysconfig' -sysconfig_isset setup_ifname && exit 0 +if sysconfig.setup_ifname then + os.exit(0) +end +if platform_info.get_board_name() == 'nanostation-m' then + sysconfig.setup_ifname = sysconfig.config_ifname or sysconfig.wan_ifname or sysconfig.lan_ifname +else + sysconfig.setup_ifname = sysconfig.config_ifname or sysconfig.lan_ifname or sysconfig.wan_ifname +end -case "$(get_board_name)" in - nanostation-m) - sysconfig_set setup_ifname "$(sysconfig config_ifname || sysconfig wan_ifname || sysconfig lan_ifname)" - ;; - *) - sysconfig_set setup_ifname "$(sysconfig config_ifname || sysconfig lan_ifname || sysconfig wan_ifname)" - ;; -esac - -# Remove the old sysconfig setting -sysconfig_unset config_ifname +-- Remove the old sysconfig setting +sysconfig.config_ifname = nil diff --git a/package/gluon-status-page/Makefile b/package/gluon-status-page/Makefile index d0e9d4888894df6c0040013ac1f816c6196c7c2e..db7cc7bd7780f20328f7f69f6a463c74307697dc 100644 --- a/package/gluon-status-page/Makefile +++ b/package/gluon-status-page/Makefile @@ -12,7 +12,7 @@ define Package/gluon-status-page SECTION:=gluon CATEGORY:=Gluon TITLE:=Adds a status page showing information about the node. - DEPENDS:=+gluon-core +uhttpd + DEPENDS:=+gluon-core +lua-platform-info +uhttpd endef define Package/gluon-status-page/description diff --git a/package/gluon-status-page/files/lib/gluon/status-page/www/cgi-bin/status b/package/gluon-status-page/files/lib/gluon/status-page/www/cgi-bin/status index 636a7aa7b3fb6f35290e8bacc1f02321456b12c5..e25d460f3426bd4c89ab5bec2f7e0cf2cc420487 100755 --- a/package/gluon-status-page/files/lib/gluon/status-page/www/cgi-bin/status +++ b/package/gluon-status-page/files/lib/gluon/status-page/www/cgi-bin/status @@ -1,6 +1,6 @@ #!/bin/sh -. /lib/gluon/functions/model.sh +model="$(lua -e 'print(require("platform_info").get_model())')" escape_html() { sed 's/&/\&/g; s/</\</g; s/>/\>/g; s/"/\"/g; s/'"'"'/\'/g' @@ -27,7 +27,7 @@ echo "<h1>$(cat /proc/sys/kernel/hostname)</h1>" echo "<pre>" -echo "Model: $(get_model | escape_html)" +echo "Model: $model" | escape_html echo "Firmware release: $(cat /lib/gluon/release | escape_html)" echo