merge: base: update base-files and basic config

Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>

5 files changed, 12 insertions, 12 deletions

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 077bed469d..5afb02db28 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -34,7 +34,7 @@ define Package/base-files
   SECTION:=base
   CATEGORY:=Base system
   DEPENDS:=+netifd +libc +procd +jsonfilter +SIGNED_PACKAGES:usign +SIGNED_PACKAGES:lede-keyring +NAND_SUPPORT:ubi-utils +fstools +fwtool
-  TITLE:=Base filesystem for Lede
+  TITLE:=Base filesystem for OpenWrt
   URL:=http://openwrt.org/
   VERSION:=$(PKG_RELEASE)-$(REVISION)
 endef
diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate
index a8311fc595..bbed567def 100755
--- a/package/base-files/files/bin/config_generate
+++ b/package/base-files/files/bin/config_generate
@@ -223,7 +223,7 @@ generate_static_system() {
 	uci -q batch <<-EOF
 		delete system.@system[0]
 		add system system
-		set system.@system[-1].hostname='LEDE'
+		set system.@system[-1].hostname='OpenWrt'
 		set system.@system[-1].timezone='UTC'
 		set system.@system[-1].ttylogin='0'
 		set system.@system[-1].log_size='64'
@@ -233,10 +233,10 @@ generate_static_system() {
 		set system.ntp='timeserver'
 		set system.ntp.enabled='1'
 		set system.ntp.enable_server='0'
-		add_list system.ntp.server='0.lede.pool.ntp.org'
-		add_list system.ntp.server='1.lede.pool.ntp.org'
-		add_list system.ntp.server='2.lede.pool.ntp.org'
-		add_list system.ntp.server='3.lede.pool.ntp.org'
+		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
diff --git a/package/base-files/files/etc/init.d/system b/package/base-files/files/etc/init.d/system
index 8c5f677299..531aa8cbc5 100755
--- a/package/base-files/files/etc/init.d/system
+++ b/package/base-files/files/etc/init.d/system
@@ -7,7 +7,7 @@ USE_PROCD=1
 validate_system_section()
 {
 	uci_validate_section system system "${1}" \
-		'hostname:string:lede' \
+		'hostname:string:OpenWrt' \
 		'conloglevel:uinteger' \
 		'buffersize:uinteger' \
 		'timezone:string:UTC' \
diff --git a/package/base-files/files/lib/preinit/10_indicate_preinit b/package/base-files/files/lib/preinit/10_indicate_preinit
index 5442a749b1..c3ec7bfdf7 100644
--- a/package/base-files/files/lib/preinit/10_indicate_preinit
+++ b/package/base-files/files/lib/preinit/10_indicate_preinit
@@ -113,7 +113,7 @@ preinit_ip() {
 		preinit_config_board
 	fi
 
-	preinit_net_echo "Doing Lede Preinit\n"
+	preinit_net_echo "Doing OpenWrt Preinit\n"
 }
 
 preinit_ip_deconfig() {
diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in
index 87d2ac6c54..88ec50a8e8 100644
--- a/package/base-files/image-config.in
+++ b/package/base-files/image-config.in
@@ -158,7 +158,7 @@ if VERSIONOPT
 	config VERSION_DIST
 		string
 		prompt "Release distribution"
-		default "LEDE"
+		default "OpenWrt"
 		help
 			This is the name of the release distribution.
 			If unspecified, it defaults to OpenWrt.
@@ -201,13 +201,13 @@ if VERSIONOPT
 			 %c .. Configured release revision code or value of %R, lowercase
 			 %N .. Release name, uppercase
 			 %n .. Release name, lowercase
-			 %D .. Distribution name or "Lede", uppercase
-			 %d .. Distribution name or "lede", lowercase
+			 %D .. Distribution name or "OpenWrt", uppercase
+			 %d .. Distribution name or "openwrt", lowercase
 			 %T .. Target name
 			 %S .. Target/Subtarget name
 			 %A .. Package architecture
 			 %t .. Build taint flags, e.g. "no-all busybox"
-			 %M .. Manufacturer name or "Lede"
+			 %M .. Manufacturer name or "OpenWrt"
 			 %P .. Product name or "Generic"
 			 %h .. Hardware revision or "v0"