From 550d6e8f843155b0da08a522eceb452185879912 Mon Sep 17 00:00:00 2001
From: Zoltan HERPAI <wigyori@uid0.hu>
Date: Tue, 7 Nov 2017 09:45:50 +0100
Subject: [PATCH] merge: base: update base-files and basic config
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
---
base-files/Makefile | 2 +-
base-files/files/bin/config_generate | 10 +++++-----
base-files/files/etc/init.d/system | 2 +-
base-files/files/lib/preinit/10_indicate_preinit | 2 +-
base-files/image-config.in | 8 ++++----
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/base-files/Makefile b/base-files/Makefile
index 077bed469df..5afb02db287 100644
--- a/base-files/Makefile
+++ b/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/base-files/files/bin/config_generate b/base-files/files/bin/config_generate
index a8311fc595b..bbed567defc 100755
--- a/base-files/files/bin/config_generate
+++ b/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/base-files/files/etc/init.d/system b/base-files/files/etc/init.d/system
index 8c5f6772996..531aa8cbc54 100755
--- a/base-files/files/etc/init.d/system
+++ b/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/base-files/files/lib/preinit/10_indicate_preinit b/base-files/files/lib/preinit/10_indicate_preinit
index 5442a749b18..c3ec7bfdf77 100644
--- a/base-files/files/lib/preinit/10_indicate_preinit
+++ b/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/base-files/image-config.in b/base-files/image-config.in
index 87d2ac6c546..88ec50a8e86 100644
--- a/base-files/image-config.in
+++ b/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"
--
GitLab