package/gluon-setup-mode/files/lib/gluon/setup-mode/rc.d/K99umount

-/etc/init.d/umount
\ No newline at end of file

package/gluon-setup-mode/files/lib/gluon/setup-mode/rc.d/S00sysfixtime

-/etc/init.d/sysfixtime
\ No newline at end of file

package/gluon-setup-mode/files/lib/gluon/setup-mode/rc.d/S10boot

-/etc/init.d/boot
\ No newline at end of file

package/gluon-setup-mode/files/lib/gluon/setup-mode/rc.d/S10system

-/etc/init.d/system
\ No newline at end of file

package/gluon-setup-mode/files/lib/gluon/setup-mode/rc.d/S11bootcount

+#!/bin/sh /etc/rc.common
+
+# shellcheck disable=SC1091
+
+if [ -x /etc/init.d/bootcount ] && /etc/init.d/bootcount enabled; then
+	. /etc/init.d/bootcount
+fi

package/gluon-setup-mode/files/lib/gluon/setup-mode/rc.d/S11sysctl

-/etc/init.d/sysctl
\ No newline at end of file

package/gluon-setup-mode/files/lib/gluon/setup-mode/rc.d/S12log

-/etc/init.d/log
\ No newline at end of file

package/gluon-setup-mode/files/lib/gluon/setup-mode/rc.d/S13haveged

-#!/bin/sh /etc/rc.common
-
-if [ -x /etc/init.d/haveged ] && /etc/init.d/haveged enabled; then
-	. /etc/init.d/haveged
-fi

package/gluon-setup-mode/files/lib/gluon/setup-mode/rc.d/S13urngd

+#!/bin/sh /etc/rc.common
+
+# shellcheck disable=SC1091
+
+if [ -x /etc/init.d/urngd ] && /etc/init.d/urngd enabled; then
+	. /etc/init.d/urngd
+fi

package/gluon-setup-mode/files/lib/gluon/setup-mode/rc.d/S15gluon-setup-mode

@@ -2,15 +2,15 @@
 
 START=15
 
-
 boot() {
-	local enabled="$(uci -q get 'gluon-setup-mode.@setup_mode[0].enabled')"
-	local configured="$(uci -q get 'gluon-setup-mode.@setup_mode[0].configured')"
+	local enabled configured
+	enabled="$(uci -q get 'gluon-setup-mode.@setup_mode[0].enabled')"
+	configured="$(uci -q get 'gluon-setup-mode.@setup_mode[0].configured')"
 
 	uci set 'gluon-setup-mode.@setup_mode[0].enabled=0'
 	uci commit gluon-setup-mode
 
-	if [ "$enabled" != 1 -a "$configured" = 1 ]; then
+	if [ "$enabled" != 1 ] && [ "$configured" = 1 ]; then
 		# This can happen after an upgrade from a version before the config file was called gluon-setup-mode
 		# We'll just reboot to return to the normal mode...
 		/etc/init.d/done boot

package/gluon-setup-mode/files/lib/gluon/setup-mode/rc.d/S50dropbear

 #!/bin/sh /etc/rc.common
 
-USE_PROCD=1
-PROG=/usr/sbin/dropbear
-NAME=dropbear
+# shellcheck disable=SC1091
 
-start_service() {
 [ -x /etc/init.d/dropbear ] || return 0
-
 . /etc/init.d/dropbear
 
-	[ -s /etc/dropbear/dropbear_rsa_host_key ] || keygen
-
-	. /lib/functions.sh
-	. /lib/functions/network.sh
+start_service() {
+	hk_generate_as_needed
 
 	procd_open_instance
-	procd_set_param command "$PROG" -F -f
+	procd_set_param command /lib/gluon/setup-mode/dropbear/dropbear -F -B
 	procd_set_param respawn
 	procd_close_instance
 }

package/gluon-setup-mode/files/lib/gluon/setup-mode/rc.d/S95done

-/etc/init.d/done
\ No newline at end of file

package/gluon-setup-mode/files/lib/gluon/setup-mode/rc.d/S96led

 #!/bin/sh /etc/rc.common
 
+# shellcheck disable=SC1091,SC2154
+
 START=96
 
 start() {
+	local custom_led
+
 	/etc/init.d/led start
 
 	. /etc/diag.sh
-	get_status_led
+
+	get_status_led 2> /dev/null
+
+	if [ -z "$status_led" ]; then
+		status_led="$running"
+	fi
+
+	if [ -z "$status_led" ]; then
+		status_led="$boot"
+	fi
+
+	custom_led="$(lua -e 'print(require("gluon.setup-mode").get_status_led() or "")')"
+	if [ -z "$status_led" ]; then
+		status_led="$custom_led"
+	fi
+
 	status_led_set_timer 1000 300
 }

package/gluon-setup-mode/files/lib/preinit/90_setup_mode

@@ -2,11 +2,16 @@
 
 
 setup_mode_enable() {
-	local enabled="$(uci -q get 'gluon-setup-mode.@setup_mode[0].enabled')"
-	local configured="$(uci -q get 'gluon-setup-mode.@setup_mode[0].configured')"
+	local enabled configured
+	enabled="$(uci -q get 'gluon-setup-mode.@setup_mode[0].enabled')"
+	configured="$(uci -q get 'gluon-setup-mode.@setup_mode[0].configured')"
 
-	if [ "$enabled" = 1 -o "$configured" != 1 ]; then
+	if [ "$enabled" = 1 ] || [ "$configured" != 1 ]; then
 		echo '/lib/gluon/setup-mode/rc.d' > /tmp/rc_d_path
+
+		# This directory is a marker for scripts to know that we're
+		# in config mode, but it is also used for temporary files
+		mkdir -p /var/gluon/setup-mode
 	fi
 }
 

package/gluon-setup-mode/files/usr/bin/gluon-enter-setup-mode

+#!/bin/sh
+
+set -eu
+
+echo "Entering setup mode and rebooting..."
+uci set gluon-setup-mode.@setup_mode[0].enabled='1'
+uci commit gluon-setup-mode
+reboot

package/gluon-setup-mode/luasrc/lib/gluon/upgrade/310-setup-mode-migrate

-#!/usr/bin/lua
-
-local uci = require('simple-uci').cursor()
-
-
-local old = uci:get_first('gluon-config-mode', 'wizard', 'configured')
-if old == '1' then
-	local setup_mode = uci:get_first('gluon-setup-mode', 'setup_mode')
-	uci:set('gluon-setup-mode', setup_mode, 'configured', true)
-
-	uci:save('gluon-setup-mode')
-end
-
-os.remove('/etc/config/gluon-config-mode')

package/gluon-setup-mode/luasrc/lib/gluon/upgrade/320-setup-ifname

@@ -3,27 +3,13 @@
 local platform = require 'gluon.platform'
 local sysconfig = require 'gluon.sysconfig'
 
-
-if sysconfig.setup_ifname then
-	os.exit(0)
-end
-
-if platform.match('ar71xx', 'generic', {
-	'cpe210',
-	'cpe510',
-	'wbs210',
-	'wbs510',
-	'airgateway',
-	'nanostation-m',
-	'nanostation-m-xw',
-	'unifi-outdoor-plus',
-	'uap-pro',
-	'unifiac-pro'
-}) or platform.match('ar71xx', 'mikrotik') then
-	sysconfig.setup_ifname = sysconfig.config_ifname or sysconfig.wan_ifname or sysconfig.lan_ifname
+if platform.is_outdoor_device() or
+	platform.match('ath79', 'generic', {
+		'ubnt,unifi-ap-pro',
+		'ubnt,unifiac-pro',
+	})
+then
+	sysconfig.setup_ifname = sysconfig.single_ifname or sysconfig.wan_ifname
 else
-	sysconfig.setup_ifname = sysconfig.config_ifname or sysconfig.lan_ifname or sysconfig.wan_ifname
+	sysconfig.setup_ifname = sysconfig.single_ifname or sysconfig.lan_ifname
 end
-
--- Remove the old sysconfig setting
-sysconfig.config_ifname = nil

package/gluon-setup-mode/luasrc/usr/lib/lua/gluon/setup-mode.lua

+local platform = require 'gluon.platform'
+
+
+local M = {}
+
+function M.get_status_led()
+	if platform.match('ath79', 'nand', {
+		'glinet,gl-xe300',
+	}) then
+		return "green:wlan"
+	end
+end
+
+return M

package/gluon-site/Makefile

@@ -3,14 +3,10 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=gluon-site
 
 GLUON_SITEDIR = $(call qstrip,$(CONFIG_GLUON_SITEDIR))
-GLUON_SITE_VERSION = $(shell ( cd '$(GLUON_SITEDIR)' && git --git-dir=.git describe --always --dirty=+ ) 2>/dev/null || echo unknown)
-PKG_VERSION:=$(if $(DUMP),x,$(GLUON_SITE_VERSION))
 
-PKG_CONFIG_DEPENDS := CONFIG_GLUON_RELEASE CONFIG_GLUON_SITEDIR CONFIG_GLUON_MULTIDOMAIN
+PKG_CONFIG_DEPENDS := CONFIG_GLUON_SITE_VERSION CONFIG_GLUON_RELEASE CONFIG_GLUON_SITEDIR CONFIG_GLUON_MULTIDOMAIN
 PKG_FILE_DEPENDS := $(GLUON_SITEDIR)/site.conf $(GLUON_SITEDIR)/domains/ $(GLUON_SITEDIR)/i18n/
-PKG_BUILD_DEPENDS := lua-cjson/host
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_DEPENDS := lua-jsonc/host gluon-web/host
 
 include ../gluon.mk
 
@@ -21,6 +17,11 @@ define Package/gluon-site
 endef
 
 define Package/gluon-site/config
+config GLUON_SITE_VERSION
+	string "Gluon site version number"
+	depends on PACKAGE_gluon-site
+	default ""
+
 config GLUON_RELEASE
 	string "Gluon release number"
 	depends on PACKAGE_gluon-site
@@ -38,7 +39,7 @@ endef
 
 define GenerateJSON
 	GLUON_SITEDIR='$$(GLUON_SITEDIR)' GLUON_SITE_CONFIG='$(1).conf' \
-		lua -e 'print(require("cjson").encode(assert(dofile("../../scripts/site_config.lua")(os.getenv("GLUON_SITE_CONFIG")))))' \
+		lua -e 'print(require("jsonc").stringify(assert(dofile("../../scripts/site_config.lua")(os.getenv("GLUON_SITE_CONFIG")))))' \
 		> '$$(PKG_BUILD_DIR)/$(1).json'
 endef
 
@@ -49,7 +50,14 @@ define Build/Compile
 	rm -rf $(PKG_BUILD_DIR)/domains
 	mkdir -p $(PKG_BUILD_DIR)/domains
 	$(foreach domain,$(patsubst $(GLUON_SITEDIR)/domains/%.conf,%,$(wildcard $(GLUON_SITEDIR)/domains/*.conf)),
-		[ ! -e '$(PKG_BUILD_DIR)/domains/$(domain).json' ]
+		@if [ -e '$(PKG_BUILD_DIR)/domains/$(domain).json' ]; then \
+			link='$(PKG_BUILD_DIR)/domains/$(domain).json'; \
+			other="$$$$(basename $$$$(readlink -f "$$$$link") .json)"; \
+			if [ "$$$$other" ]; then \
+				echo >&2 "Error: Failed to install domain '"'$(domain)'"', name already taken by domain '$$$$other'."; \
+			fi; \
+			exit 1; \
+		fi
 		$(call GenerateJSON,domains/$(domain))
 		@lua ../../scripts/domain_aliases.lua '$(PKG_BUILD_DIR)/domains/$(domain).json' | while read alias; do \
 			[ "$$$${alias}" != '$(domain)' ] || continue; \
@@ -57,7 +65,7 @@ define Build/Compile
 			if ! ln -s '$(domain).json' "$$$$link"; then \
 				other="$$$$(basename $$$$(readlink -f "$$$$link") .json)"; \
 				if [ "$$$$other" ]; then \
-					echo >&2 "Failed to alias domain '"'$(domain)'"' as '$$$$alias', name already taken by domain '$$$$other'."; \
+					echo >&2 "Error: Failed to alias domain '"'$(domain)'"' as '$$$$alias', name already taken by domain '$$$$other'."; \
 				fi; \
 				exit 1; \
 			fi; \
@@ -76,7 +84,7 @@ define Package/gluon-site/install
 	$(CP) $(PKG_BUILD_DIR)/domains $(1)/lib/gluon/
   endif
 
-	echo '$(GLUON_SITE_VERSION)' > $(1)/lib/gluon/site-version
+	echo '$(call qstrip,$(CONFIG_GLUON_SITE_VERSION))' > $(1)/lib/gluon/site-version
 	echo '$(call qstrip,$(CONFIG_GLUON_RELEASE))' > $(1)/lib/gluon/release
 
 	$(GluonInstallI18N)