Преглед на файлове

add new config option for the hostname in /etc/config/system (fixes #1302, #1438)

SVN-Revision: 6532
Felix Fietkau преди 19 години
родител
ревизия
b77680287e
променени са 2 файла, в които са добавени 13 реда и са изтрити 2 реда
  1. 2 0
      package/base-files/files/etc/config/system
  2. 11 2
      package/base-files/files/etc/init.d/boot

+ 2 - 0
package/base-files/files/etc/config/system

@@ -0,0 +1,2 @@
+config system
+	option hostname	OpenWrt

+ 11 - 2
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