From: Jo-Philipp Wich <jo@mein.io>
Date: Tue, 31 May 2016 12:19:45 +0000 (+0200)
Subject: base-files: support hostname and ntp servers through board.d
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=528b8f6f9387c9c3f10260e31a50cc53d1bd1cb4;p=openwrt%2Fstaging%2Fnbd.git

base-files: support hostname and ntp servers through board.d

Add support for specifying hostname and NTP servers via /etc/board.d/ scripts.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate
index 345393ca9c..2036ae44fe 100755
--- a/package/base-files/files/bin/config_generate
+++ b/package/base-files/files/bin/config_generate
@@ -220,6 +220,50 @@ generate_switch() {
 	json_select ..
 }
 
+
+generate_static_system() {
+	uci -q batch <<-EOF
+		delete system.@system[0]
+		add system system
+		set system.@system[-1].hostname='lede'
+		set system.@system[-1].timezone='UTC'
+		set system.@system[-1].ttylogin='0'
+
+		delete system.ntp
+		set system.ntp='timeserver'
+		set system.ntp.enabled='1'
+		set system.ntp.enable_server='0'
+		add_list system.ntp.server='0.openwrt.pool.ntp.org'
+		add_list system.ntp.server='1.openwrt.pool.ntp.org'
+		add_list system.ntp.server='2.openwrt.pool.ntp.org'
+		add_list system.ntp.server='3.openwrt.pool.ntp.org'
+	EOF
+
+	if json_is_a system object; then
+		json_select system
+			local hostname
+			if json_get_var hostname hostname; then
+				uci -q set "system.@system[-1].hostname=$hostname"
+			fi
+
+			if json_is_a ntpserver array; then
+				local keys key
+				json_get_keys keys ntpserver
+				json_select ntpserver
+					uci -q delete "system.ntp.server"
+
+					for key in $keys; do
+						local server
+						if json_get_var server "$key"; then
+							uci -q add_list "system.ntp.server=$server"
+						fi
+					done
+				json_select ..
+			fi
+		json_select ..
+	fi
+}
+
 generate_rssimon() {
 	local key="$1"
 	local cfg="rssid_$key"
@@ -354,6 +398,9 @@ for key in $keys; do generate_network $key; done
 json_get_keys keys switch
 for key in $keys; do generate_switch $key; done
 
+
+generate_static_system
+
 json_get_keys keys rssimon
 for key in $keys; do generate_rssimon $key; done