diff --git a/package/gluon-config-mode/files/etc/config/configmode b/package/gluon-config-mode/files/etc/config/config-mode
similarity index 100%
rename from package/gluon-config-mode/files/etc/config/configmode
rename to package/gluon-config-mode/files/etc/config/config-mode
diff --git a/package/gluon-config-mode/files/etc/hotplug.d/button/50-config-mode b/package/gluon-config-mode/files/etc/hotplug.d/button/50-config-mode
new file mode 100755
index 0000000000000000000000000000000000000000..59dcd7def6d28d0ee8585b883cc1cf0e61d6bac0
--- /dev/null
+++ b/package/gluon-config-mode/files/etc/hotplug.d/button/50-config-mode
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+
+wait=3
+
+
+wait_config_mode() {
+ sleep $wait
+ uci set 'config-mode.@wizard[0].enabled=1'
+ uci commit config-mode
+ reboot
+}
+
+
+if [ "$BUTTON" = wps -o "$BUTTON" = reset ]; then
+ case "$ACTION" in
+ pressed)
+ wait_config_mode &
+ PID=$!
+ echo $PID > /tmp/.wait_config_mode
+ ;;
+ released)
+ if [ -r /tmp/.wait_config_mode ]; then
+ kill $(cat /tmp/.wait_config_mode)
+ rm /tmp/.wait_config_mode
+ fi
+ ;;
+ esac
+fi
diff --git a/package/gluon-config-mode/files/etc/hotplug.d/button/50-configmode b/package/gluon-config-mode/files/etc/hotplug.d/button/50-configmode
deleted file mode 100755
index d5032d2100d13c3a0824ab7919f0bee3e767413a..0000000000000000000000000000000000000000
--- a/package/gluon-config-mode/files/etc/hotplug.d/button/50-configmode
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-
-wait=3
-
-
-wait_configmode() {
- sleep $wait
- uci set 'configmode.@wizard[0].enabled=1'
- uci commit configmode
- reboot
-}
-
-
-if [ "$BUTTON" = wps -o "$BUTTON" = reset ]; then
- case "$ACTION" in
- pressed)
- wait_configmode &
- PID=$!
- echo $PID > /tmp/.wait_configmode
- ;;
- released)
- if [ -r /tmp/.wait_configmode ]; then
- kill $(cat /tmp/.wait_configmode)
- rm /tmp/.wait_configmode
- fi
- ;;
- esac
-fi
diff --git a/package/gluon-config-mode/files/etc/init.d/config-mode b/package/gluon-config-mode/files/etc/init.d/config-mode
new file mode 100755
index 0000000000000000000000000000000000000000..3d462c329618e9ea2f2495ceda4f7113f70aa8f3
--- /dev/null
+++ b/package/gluon-config-mode/files/etc/init.d/config-mode
@@ -0,0 +1,54 @@
+#!/bin/sh /etc/rc.common
+
+START=12
+
+
+config_mode_iface=eth0
+config_mode_addr=192.168.1.1
+config_mode_plen=24
+
+config_mode_dnsname=freifunk
+config_mode_dhcp_range=192.168.1.2,192.168.1.254
+
+check_enable() {
+ config_get enabled "$1" enabled
+ config_get configured "$1" configured
+
+ if [ "$enabled" = 1 -o "$configured" != 1 ]; then
+ export enable=1
+ fi
+}
+
+start() {
+ enable=0
+ config_load config-mode
+ config_foreach check_enable wizard
+
+ if [ "$enable" = '1' ]; then
+ lua -luci -e 'require "luci.model.uci"; uci_state=luci.model.uci.cursor_state(); uci_state:section("config-mode", "wizard", nil, { running = "1" }); uci_state:save("config-mode")'
+ uci set 'config-mode.@wizard[0].enabled=0'
+ uci commit config-mode
+
+ ip addr add $config_mode_addr/$config_mode_plen dev $config_mode_iface
+ ip link set up dev $config_mode_iface
+
+ /etc/init.d/haveged start
+ /etc/init.d/telnet start
+ /etc/init.d/dropbear start
+ /etc/init.d/uhttpd start
+ /etc/init.d/led start
+
+ # correctly finish firstboot
+ /etc/init.d/done boot
+
+ echo "$config_mode_addr $config_mode_dnsname" > /tmp/hosts.config-mode
+ dnsmasq -h -H /tmp/hosts.config-mode -R -F interface:$config_mode_iface,$config_mode_dhcp_range -l /tmp/dhcp.leases -O option:router
+
+ . /etc/diag.sh
+ get_status_led
+ status_led_set_timer 1000 300
+
+ # block further boot
+ while true; do sleep 1; done
+ fi
+}
diff --git a/package/gluon-config-mode/files/etc/init.d/configmode b/package/gluon-config-mode/files/etc/init.d/configmode
deleted file mode 100755
index 7055d130a0d1bcff7b9d1f1d2e2543fa6a6fe78e..0000000000000000000000000000000000000000
--- a/package/gluon-config-mode/files/etc/init.d/configmode
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=12
-
-
-configmode_iface=eth0
-configmode_addr=192.168.1.1
-configmode_plen=24
-
-configmode_dnsname=freifunk
-configmode_dhcp_range=192.168.1.2,192.168.1.254
-
-check_enable() {
- config_get enabled "$1" enabled
- config_get configured "$1" configured
-
- if [ "$enabled" = 1 -o "$configured" != 1 ]; then
- export enable=1
- fi
-}
-
-start() {
- enable=0
- config_load configmode
- config_foreach check_enable wizard
-
- if [ "$enable" = '1' ]; then
- lua -luci -e 'require "luci.model.uci"; uci_state=luci.model.uci.cursor_state(); uci_state:section("configmode", "wizard", nil, { running = "1" }); uci_state:save("configmode")'
- uci set 'configmode.@wizard[0].enabled=0'
- uci commit configmode
-
- ip addr add $configmode_addr/$configmode_plen dev $configmode_iface
- ip link set up dev $configmode_iface
-
- /etc/init.d/haveged start
- /etc/init.d/telnet start
- /etc/init.d/dropbear start
- /etc/init.d/uhttpd start
- /etc/init.d/led start
-
- # correctly finish firstboot
- /etc/init.d/done boot
-
- echo "$configmode_addr $configmode_dnsname" > /tmp/hosts.configmode
- dnsmasq -h -H /tmp/hosts.configmode -R -F interface:$configmode_iface,$configmode_dhcp_range -l /tmp/dhcp.leases -O option:router
-
- . /etc/diag.sh
- get_status_led
- status_led_set_timer 1000 300
-
- # block further boot
- while true; do sleep 1; done
- fi
-}
diff --git a/package/gluon-config-mode/files/lib/gluon/upgrade/config-mode/invariant/001-migrate-uci-config b/package/gluon-config-mode/files/lib/gluon/upgrade/config-mode/invariant/001-migrate-uci-config
index e3ff8f2c996c63d68f3fbd88f2baacaa163baeb2..1aa788dcad5a67dfb20baba5d06ae2f20d07dec1 100755
--- a/package/gluon-config-mode/files/lib/gluon/upgrade/config-mode/invariant/001-migrate-uci-config
+++ b/package/gluon-config-mode/files/lib/gluon/upgrade/config-mode/invariant/001-migrate-uci-config
@@ -1,6 +1,6 @@
#!/bin/sh
OLD_CFG=/etc/config/config_mode
-NEW_CFG=/etc/config/configmode
+NEW_CFG=/etc/config/config-mode
[ -f $OLD_CFG ] && mv $OLD_CFG $NEW_CFG
diff --git a/package/gluon-config-mode/files/lib/gluon/upgrade/configmode/invariant/001-migrate-uci-config b/package/gluon-config-mode/files/lib/gluon/upgrade/configmode/invariant/001-migrate-uci-config
deleted file mode 100755
index e3ff8f2c996c63d68f3fbd88f2baacaa163baeb2..0000000000000000000000000000000000000000
--- a/package/gluon-config-mode/files/lib/gluon/upgrade/configmode/invariant/001-migrate-uci-config
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-OLD_CFG=/etc/config/config_mode
-NEW_CFG=/etc/config/configmode
-
-[ -f $OLD_CFG ] && mv $OLD_CFG $NEW_CFG
diff --git a/package/gluon-config-mode/files/usr/lib/lua/luci/controller/configmode/configmode.lua b/package/gluon-config-mode/files/usr/lib/lua/luci/controller/config-mode/config-mode.lua
similarity index 55%
rename from package/gluon-config-mode/files/usr/lib/lua/luci/controller/configmode/configmode.lua
rename to package/gluon-config-mode/files/usr/lib/lua/luci/controller/config-mode/config-mode.lua
index 71a1a60f10f290c597a1c8ec643ad272f300a56d..ac7d7901a4cc48ba5e9a6fd61ada8d114f2b37c5 100644
--- a/package/gluon-config-mode/files/usr/lib/lua/luci/controller/configmode/configmode.lua
+++ b/package/gluon-config-mode/files/usr/lib/lua/luci/controller/config-mode/config-mode.lua
@@ -10,54 +10,54 @@ You may obtain a copy of the License at
$Id$
]]--
-module("luci.controller.configmode.configmode", package.seeall)
+module("luci.controller.config-mode.config-mode", package.seeall)
local meshvpn_name = "mesh_vpn"
function index()
local uci_state = luci.model.uci.cursor_state()
- if uci_state:get_first("configmode", "wizard", "running", "0") == "1" then
+ if uci_state:get_first("config-mode", "wizard", "running", "0") == "1" then
local root = node()
if not root.target then
- root.target = alias("configmode")
+ root.target = alias("config-mode")
root.index = true
end
page = node()
page.lock = true
- page.target = alias("configmode")
+ page.target = alias("config-mode")
page.subindex = true
page.index = false
- page = node("configmode")
- page.title = _("Configmode")
- page.target = alias("configmode", "wizard")
+ page = node("config-mode")
+ page.title = _("Wizard")
+ page.target = alias("config-mode", "wizard")
page.order = 5
page.setuser = "root"
page.setgroup = "root"
page.index = true
- entry({"configmode", "wizard"}, form("configmode/wizard")).index = true
- entry({"configmode", "reboot"}, call("action_reboot"))
+ entry({"config-mode", "wizard"}, form("config-mode/wizard")).index = true
+ entry({"config-mode", "reboot"}, call("action_reboot"))
end
end
function action_reboot()
- local configmode = require "luci.tools.configmode"
+ local configmode = require "luci.tools.config-mode"
local pubkey
local uci = luci.model.uci.cursor()
local meshvpn_enabled = uci:get("fastd", meshvpn_name, "enabled", "0")
if meshvpn_enabled == "1" then
pubkey = configmode.get_fastd_pubkey(meshvpn_name)
end
- luci.template.render("configmode/reboot", {pubkey=pubkey})
+ luci.template.render("config-mode/reboot", {pubkey=pubkey})
- uci:foreach("configmode", "wizard", function(s)
- uci:set("configmode", s[".name"], "configured", "1")
+ uci:foreach("config-mode", "wizard", function(s)
+ uci:set("config-mode", s[".name"], "configured", "1")
end)
- uci:save("configmode")
- uci:commit("configmode")
+ uci:save("config-mode")
+ uci:commit("config-mode")
luci.sys.reboot()
end
diff --git a/package/gluon-config-mode/files/usr/lib/lua/luci/model/cbi/configmode/wizard.lua b/package/gluon-config-mode/files/usr/lib/lua/luci/model/cbi/config-mode/wizard.lua
similarity index 95%
rename from package/gluon-config-mode/files/usr/lib/lua/luci/model/cbi/configmode/wizard.lua
rename to package/gluon-config-mode/files/usr/lib/lua/luci/model/cbi/config-mode/wizard.lua
index d651a7c76c1f029a7024f1503635529ea276d7f4..1e3b8f738783b6cf603587a60992ed78689c874c 100644
--- a/package/gluon-config-mode/files/usr/lib/lua/luci/model/cbi/configmode/wizard.lua
+++ b/package/gluon-config-mode/files/usr/lib/lua/luci/model/cbi/config-mode/wizard.lua
@@ -1,4 +1,4 @@
-local configmode = require "luci.tools.configmode"
+local configmode = require "luci.tools.config-mode"
local meshvpn_name = "mesh_vpn"
local uci = luci.model.uci.cursor()
local f, s, o
@@ -75,7 +75,7 @@ function f.handle(self, state, data)
uci:save("system")
uci:commit("system")
- luci.http.redirect(luci.dispatcher.build_url("configmode", "reboot"))
+ luci.http.redirect(luci.dispatcher.build_url("config-mode", "reboot"))
end
return true
diff --git a/package/gluon-config-mode/files/usr/lib/lua/luci/tools/configmode.lua b/package/gluon-config-mode/files/usr/lib/lua/luci/tools/config-mode.lua
similarity index 95%
rename from package/gluon-config-mode/files/usr/lib/lua/luci/tools/configmode.lua
rename to package/gluon-config-mode/files/usr/lib/lua/luci/tools/config-mode.lua
index 3b4c8b6bdb9dca32653c9ff956d9a865c36e196d..4250ddd2db47ec96fb74a24eec1e044ffba8264a 100644
--- a/package/gluon-config-mode/files/usr/lib/lua/luci/tools/configmode.lua
+++ b/package/gluon-config-mode/files/usr/lib/lua/luci/tools/config-mode.lua
@@ -1,7 +1,7 @@
local luci = require "luci"
local io = require "io"
-module "luci.tools.configmode"
+module "luci.tools.config-mode"
function setup_fastd_secret(name)
local uci = luci.model.uci.cursor()
diff --git a/package/gluon-config-mode/generate/usr/lib/lua/luci/view/configmode/reboot.htm b/package/gluon-config-mode/generate/usr/lib/lua/luci/view/config-mode/reboot.htm
similarity index 100%
rename from package/gluon-config-mode/generate/usr/lib/lua/luci/view/configmode/reboot.htm
rename to package/gluon-config-mode/generate/usr/lib/lua/luci/view/config-mode/reboot.htm