diff --git a/package/gluon-config-mode/files/etc/config/config-mode b/package/gluon-config-mode/files/etc/config/gluon-config-mode
similarity index 100%
rename from package/gluon-config-mode/files/etc/config/config-mode
rename to package/gluon-config-mode/files/etc/config/gluon-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-gluon-config-mode
similarity index 100%
rename from package/gluon-config-mode/files/etc/hotplug.d/button/50-config-mode
rename to package/gluon-config-mode/files/etc/hotplug.d/button/50-gluon-config-mode
diff --git a/package/gluon-config-mode/files/etc/init.d/config-mode b/package/gluon-config-mode/files/etc/init.d/gluon-config-mode
similarity index 67%
rename from package/gluon-config-mode/files/etc/init.d/config-mode
rename to package/gluon-config-mode/files/etc/init.d/gluon-config-mode
index 3d462c329618e9ea2f2495ceda4f7113f70aa8f3..ca72a580bf2934f0f3c737e695c1c418d1757b65 100755
--- a/package/gluon-config-mode/files/etc/init.d/config-mode
+++ b/package/gluon-config-mode/files/etc/init.d/gluon-config-mode
@@ -21,13 +21,13 @@ check_enable() {
start() {
enable=0
- config_load config-mode
+ config_load gluon-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
+ lua -luci -e 'require "luci.model.uci"; uci_state=luci.model.uci.cursor_state(); uci_state:section("gluon-config-mode", "wizard", nil, { running = "1" }); uci_state:save("gluon-config-mode")'
+ uci set 'gluon-config-mode.@wizard[0].enabled=0'
+ uci commit gluon-config-mode
ip addr add $config_mode_addr/$config_mode_plen dev $config_mode_iface
ip link set up dev $config_mode_iface
@@ -41,8 +41,8 @@ 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
+ echo "$config_mode_addr $config_mode_dnsname" > /tmp/hosts.gluon-config-mode
+ dnsmasq -h -H /tmp/hosts.gluon-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
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/gluon-config-mode/invariant/001-migrate-uci-config
similarity index 68%
rename from package/gluon-config-mode/files/lib/gluon/upgrade/config-mode/invariant/001-migrate-uci-config
rename to package/gluon-config-mode/files/lib/gluon/upgrade/gluon-config-mode/invariant/001-migrate-uci-config
index 1aa788dcad5a67dfb20baba5d06ae2f20d07dec1..657012da9d9f64814d1dc2259f860c1f649fe450 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/gluon-config-mode/invariant/001-migrate-uci-config
@@ -1,6 +1,6 @@
#!/bin/sh
OLD_CFG=/etc/config/config_mode
-NEW_CFG=/etc/config/config-mode
+NEW_CFG=/etc/config/gluon-config-mode
[ -f $OLD_CFG ] && mv $OLD_CFG $NEW_CFG
diff --git a/package/gluon-config-mode/files/usr/lib/lua/luci/controller/config-mode/config-mode.lua b/package/gluon-config-mode/files/usr/lib/lua/luci/controller/gluon-config-mode/index.lua
similarity index 55%
rename from package/gluon-config-mode/files/usr/lib/lua/luci/controller/config-mode/config-mode.lua
rename to package/gluon-config-mode/files/usr/lib/lua/luci/controller/gluon-config-mode/index.lua
index ac7d7901a4cc48ba5e9a6fd61ada8d114f2b37c5..5dad4a15efef7a51cadee33dae76e2af8100b103 100644
--- a/package/gluon-config-mode/files/usr/lib/lua/luci/controller/config-mode/config-mode.lua
+++ b/package/gluon-config-mode/files/usr/lib/lua/luci/controller/gluon-config-mode/index.lua
@@ -10,54 +10,54 @@ You may obtain a copy of the License at
$Id$
]]--
-module("luci.controller.config-mode.config-mode", package.seeall)
+module("luci.controller.gluon-config-mode.index", package.seeall)
local meshvpn_name = "mesh_vpn"
function index()
local uci_state = luci.model.uci.cursor_state()
- if uci_state:get_first("config-mode", "wizard", "running", "0") == "1" then
+ if uci_state:get_first("gluon-config-mode", "wizard", "running", "0") == "1" then
local root = node()
if not root.target then
- root.target = alias("config-mode")
+ root.target = alias("gluon-config-mode")
root.index = true
end
page = node()
page.lock = true
- page.target = alias("config-mode")
+ page.target = alias("gluon-config-mode")
page.subindex = true
page.index = false
- page = node("config-mode")
+ page = node("gluon-config-mode")
page.title = _("Wizard")
- page.target = alias("config-mode", "wizard")
+ page.target = alias("gluon-config-mode", "wizard")
page.order = 5
page.setuser = "root"
page.setgroup = "root"
page.index = true
- entry({"config-mode", "wizard"}, form("config-mode/wizard")).index = true
- entry({"config-mode", "reboot"}, call("action_reboot"))
+ entry({"gluon-config-mode", "wizard"}, form("gluon-config-mode/wizard")).index = true
+ entry({"gluon-config-mode", "reboot"}, call("action_reboot"))
end
end
function action_reboot()
- local configmode = require "luci.tools.config-mode"
+ local configmode = require "luci.tools.gluon-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("config-mode/reboot", {pubkey=pubkey})
+ luci.template.render("gluon-config-mode/reboot", {pubkey=pubkey})
- uci:foreach("config-mode", "wizard", function(s)
- uci:set("config-mode", s[".name"], "configured", "1")
+ uci:foreach("gluon-config-mode", "wizard", function(s)
+ uci:set("gluon-config-mode", s[".name"], "configured", "1")
end)
- uci:save("config-mode")
- uci:commit("config-mode")
+ uci:save("gluon-config-mode")
+ uci:commit("gluon-config-mode")
luci.sys.reboot()
end
diff --git a/package/gluon-config-mode/files/usr/lib/lua/luci/model/cbi/config-mode/wizard.lua b/package/gluon-config-mode/files/usr/lib/lua/luci/model/cbi/gluon-config-mode/wizard.lua
similarity index 95%
rename from package/gluon-config-mode/files/usr/lib/lua/luci/model/cbi/config-mode/wizard.lua
rename to package/gluon-config-mode/files/usr/lib/lua/luci/model/cbi/gluon-config-mode/wizard.lua
index 1e3b8f738783b6cf603587a60992ed78689c874c..89a635d51bde9341f547737ab94a1da53b3a234c 100644
--- a/package/gluon-config-mode/files/usr/lib/lua/luci/model/cbi/config-mode/wizard.lua
+++ b/package/gluon-config-mode/files/usr/lib/lua/luci/model/cbi/gluon-config-mode/wizard.lua
@@ -1,4 +1,4 @@
-local configmode = require "luci.tools.config-mode"
+local configmode = require "luci.tools.gluon-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("config-mode", "reboot"))
+ luci.http.redirect(luci.dispatcher.build_url("gluon-config-mode", "reboot"))
end
return true
diff --git a/package/gluon-config-mode/files/usr/lib/lua/luci/tools/config-mode.lua b/package/gluon-config-mode/files/usr/lib/lua/luci/tools/gluon-config-mode.lua
similarity index 95%
rename from package/gluon-config-mode/files/usr/lib/lua/luci/tools/config-mode.lua
rename to package/gluon-config-mode/files/usr/lib/lua/luci/tools/gluon-config-mode.lua
index 4250ddd2db47ec96fb74a24eec1e044ffba8264a..ba1748f1ec0d22acc97b6b1c552d31fbbe4b32b3 100644
--- a/package/gluon-config-mode/files/usr/lib/lua/luci/tools/config-mode.lua
+++ b/package/gluon-config-mode/files/usr/lib/lua/luci/tools/gluon-config-mode.lua
@@ -1,7 +1,7 @@
local luci = require "luci"
local io = require "io"
-module "luci.tools.config-mode"
+module "luci.tools.gluon-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/config-mode/reboot.htm b/package/gluon-config-mode/generate/usr/lib/lua/luci/view/gluon-config-mode/reboot.htm
similarity index 100%
rename from package/gluon-config-mode/generate/usr/lib/lua/luci/view/config-mode/reboot.htm
rename to package/gluon-config-mode/generate/usr/lib/lua/luci/view/gluon-config-mode/reboot.htm