From b77680287eec673a7e97897465b10eaab538c639 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 6 Mar 2007 21:28:57 +0000
Subject: [PATCH] add new config option for the hostname in /etc/config/system
 (fixes #1302, #1438)

SVN-Revision: 6532
---
 package/base-files/files/etc/config/system |  2 ++
 package/base-files/files/etc/init.d/boot   | 13 +++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 package/base-files/files/etc/config/system

diff --git a/package/base-files/files/etc/config/system b/package/base-files/files/etc/config/system
new file mode 100644
index 0000000000..204a73a986
--- /dev/null
+++ b/package/base-files/files/etc/config/system
@@ -0,0 +1,2 @@
+config system
+	option hostname	OpenWrt
diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot
index ed5e7d8ba5..c644b2fec2 100755
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -2,13 +2,22 @@
 # Copyright (C) 2006 OpenWrt.org
 
 START=10
+
+system_config() {
+	local cfg="$1"
+	local hostname
+	
+	config_get hostname "$cfg" hostname
+	echo "${hostname:-OpenWrt}" > /proc/sys/kernel/hostname
+}
+
 start() {
 	[ -f /proc/mounts ] || /sbin/mount_root
 	[ -f /proc/jffs2_bbc ] && echo "S" > /proc/jffs2_bbc
 	vconfig set_name_type DEV_PLUS_VID_NO_PAD
 	
-	HOSTNAME=${wan_hostname%%.*}
-	echo ${HOSTNAME:=OpenWrt}>/proc/sys/kernel/hostname
+	config_load system
+	config_foreach system_config system
 	
 	mkdir -p /var/run
 	mkdir -p /var/log