From 9de78e27b63234330a5debf98c71bdced1ac39f0 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Sat, 15 Sep 2018 22:36:08 +0200 Subject: [PATCH] gluon-config-mode-hostname: add option to use default hostname (#1529) Before 7827f89, mandatory hostname field in config mode was pre-filled with the default hostname. This commit adds the config_mode.hostname.prefill option for controlling the default value. --- docs/user/site.rst | 4 ++++ package/gluon-config-mode-hostname/check_site.lua | 1 + .../luasrc/lib/gluon/config-mode/wizard/0100-hostname.lua | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/user/site.rst b/docs/user/site.rst index da4e1a81..2d9680df 100644 --- a/docs/user/site.rst +++ b/docs/user/site.rst @@ -403,6 +403,9 @@ config_mode \: optional and the node's primary MAC address is assigned. Manually setting a hostname can be enforced by setting *hostname.optional* to *false*. + To not prefill the hostname-field in config-mode with the default hostname, + set *hostname.prefill* to *false*. + By default, no altitude field is shown by the *gluon-config-mode-geo-location* package. Set *geo_location.show_altitude* to *true* if you want the altitude field to be visible. @@ -423,6 +426,7 @@ config_mode \: optional config_mode = { hostname = { optional = false, + prefill = true, }, geo_location = { show_altitude = true, diff --git a/package/gluon-config-mode-hostname/check_site.lua b/package/gluon-config-mode-hostname/check_site.lua index 29b5edd6..a2f8d606 100644 --- a/package/gluon-config-mode-hostname/check_site.lua +++ b/package/gluon-config-mode-hostname/check_site.lua @@ -1 +1,2 @@ need_boolean(in_site({'config_mode', 'hostname', 'optional'}), false) +need_boolean(in_site({'config_mode', 'hostname', 'prefill'}), true) diff --git a/package/gluon-config-mode-hostname/luasrc/lib/gluon/config-mode/wizard/0100-hostname.lua b/package/gluon-config-mode-hostname/luasrc/lib/gluon/config-mode/wizard/0100-hostname.lua index d078b4de..53d7a1d4 100644 --- a/package/gluon-config-mode-hostname/luasrc/lib/gluon/config-mode/wizard/0100-hostname.lua +++ b/package/gluon-config-mode-hostname/luasrc/lib/gluon/config-mode/wizard/0100-hostname.lua @@ -23,7 +23,7 @@ return function(form, uci) o.optional = true o.placeholder = default_hostname end - if configured then + if configured or site.config_mode.hostname.prefill(true) then o.default = current_hostname end