From 9f86bf3155b7f1d16aa4776829ed29dbfd60419b Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 17 Mar 2018 11:44:33 +0100
Subject: [PATCH] gluon-core: add default_hostname helper
---
package/gluon-core/luasrc/lib/gluon/upgrade/030-system | 2 +-
package/gluon-core/luasrc/usr/lib/lua/gluon/util.lua | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/030-system b/package/gluon-core/luasrc/lib/gluon/upgrade/030-system
index 7d8eeda11..29432e4cd 100755
--- a/package/gluon-core/luasrc/lib/gluon/upgrade/030-system
+++ b/package/gluon-core/luasrc/lib/gluon/upgrade/030-system
@@ -15,7 +15,7 @@ local pretty_hostname = require 'pretty_hostname'
local system = uci:get_first('system', 'system')
-pretty_hostname.set(uci, site.hostname_prefix('') .. util.node_id())
+pretty_hostname.set(uci, util.default_hostname())
uci:set('system', system, 'timezone', site.timezone())
uci:save('system')
diff --git a/package/gluon-core/luasrc/usr/lib/lua/gluon/util.lua b/package/gluon-core/luasrc/usr/lib/lua/gluon/util.lua
index d6891c5f4..1becb9c1b 100644
--- a/package/gluon-core/luasrc/usr/lib/lua/gluon/util.lua
+++ b/package/gluon-core/luasrc/usr/lib/lua/gluon/util.lua
@@ -95,6 +95,10 @@ function node_id()
return string.gsub(sysconfig.primary_mac, ':', '')
end
+function default_hostname()
+ return site.hostname_prefix('') .. node_id()
+end
+
function domain_seed_bytes(key, length)
local ret = ''
local v = ''
--
GitLab