From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Thu, 7 Nov 2019 17:16:46 +0000 (+0100)
Subject: Revert "base-files: rename hostname with EUI of mac address"
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=22b8a6263d72bb1911c5841ef90ebdf452b53905;p=openwrt%2Fstaging%2Fneocturne.git

Revert "base-files: rename hostname with EUI of mac address"

This reverts commit 6170c46b477d4953f91b99e805a276de444913cf.

There has been demand for further evaluation of the impact of a
changed hostname, so this is reverted for now. The default hostname
will be "OpenWrt" again after this commit.

The macaddr_geteui() function is not removed by this revert.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---

diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate
index b473eba9e9..3ca035ca8b 100755
--- a/package/base-files/files/bin/config_generate
+++ b/package/base-files/files/bin/config_generate
@@ -3,7 +3,6 @@
 CFG=/etc/board.json
 
 . /usr/share/libubox/jshn.sh
-. /lib/functions/system.sh
 
 [ -s $CFG ] || /bin/board_detect || exit 1
 [ -s /etc/config/network -a -s /etc/config/system ] && exit 0
@@ -254,22 +253,9 @@ generate_static_system() {
 		add_list system.ntp.server='3.openwrt.pool.ntp.org'
 	EOF
 
-	local label_macaddr=$(get_mac_label_dt)
-	local hostname
-
-	if json_is_a system object; then
-		json_select system
-			[ -n "$label_macaddr" ] || json_get_var label_macaddr label_macaddr
-		json_select ..
-	fi
-
-	if [ -n "$label_macaddr" ]; then
-		hostname="OpenWrt-$(macaddr_geteui $label_macaddr)"
-		uci -q set "system.@system[-1].hostname=$hostname"
-	fi
-
 	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