package/gluon-setup-mode/files/lib/gluon/setup-mode/dropbear/etc/shells

+/lib/gluon/setup-mode/dropbear/ash

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

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

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

-S20network
\ No newline at end of file

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

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

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/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
 
+start_service() {
 	hk_generate_as_needed
 
-	. /lib/functions.sh
-	. /lib/functions/network.sh
-
 	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 2> /dev/null
 
-	if [ -z $status_led ]; then
+	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 ] || [ "$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')