From 16e89bfbfd9e0d2ac8773600029b42977c1bee71 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Thu, 18 Feb 2021 17:49:40 +0800 Subject: [PATCH] image: rename distribution to ImmortalWrt Signed-off-by: CN_SZTL --- package/base-files/image-config.in | 2 +- package/lean/autocore/files/arm/rpcd_10_system.js | 8 +++----- package/lean/autocore/files/x86/rpcd_10_system.js | 8 +++----- package/lean/default-settings/files/openwrt_banner | 2 +- .../lean/default-settings/files/zzz-default-settings | 11 ----------- 5 files changed, 8 insertions(+), 23 deletions(-) diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in index 1f06332b00..de4d3ed6f6 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 "OpenWrt" + default "ImmortalWrt" help This is the name of the release distribution. If unspecified, it defaults to OpenWrt. diff --git a/package/lean/autocore/files/arm/rpcd_10_system.js b/package/lean/autocore/files/arm/rpcd_10_system.js index 7eb69e271e..9500203d81 100644 --- a/package/lean/autocore/files/arm/rpcd_10_system.js +++ b/package/lean/autocore/files/arm/rpcd_10_system.js @@ -47,16 +47,14 @@ return baseclass.extend({ systeminfo = data[1], cpubench = data[2], cpuinfo = data[3], - cpuusage = data[4]; //, -// luciversion = data[5]; + cpuusage = data[4], + luciversion = data[5]; -/* luciversion = luciversion.filter(function(l) { return l.match(/^\s*(luciname|luciversion)\s*=/); }).map(function(l) { return l.replace(/^\s*\w+\s*=\s*['"]([^'"]+)['"].*$/, '$1'); }).join(' '); -*/ var datestr = null; @@ -77,7 +75,7 @@ return baseclass.extend({ _('Hostname'), boardinfo.hostname, _('Model'), boardinfo.model + cpubench.cpubench, _('Architecture'), cpuinfo.cpuinfo, - _('Firmware Version'), (L.isObject(boardinfo.release) ? boardinfo.release.description: '')/* + ' / ' : '') + (luciversion || '')*/, + _('Firmware Version'), (L.isObject(boardinfo.release) ? boardinfo.release.description: '') + ' / ' : '') + (luciversion || ''), _('Kernel Version'), boardinfo.kernel, _('Local Time'), datestr, _('Uptime'), systeminfo.uptime ? '%t'.format(systeminfo.uptime) : null, diff --git a/package/lean/autocore/files/x86/rpcd_10_system.js b/package/lean/autocore/files/x86/rpcd_10_system.js index 5b1e0a7b17..5260882ee3 100644 --- a/package/lean/autocore/files/x86/rpcd_10_system.js +++ b/package/lean/autocore/files/x86/rpcd_10_system.js @@ -46,16 +46,14 @@ return L.Class.extend({ systeminfo = data[1], cpubench = data[2], cpuinfo = data[3], - cpuusage = data[4]; //, -// luciversion = data[5]; + cpuusage = data[4], + luciversion = data[5]; -/* luciversion = luciversion.filter(function(l) { return l.match(/^\s*(luciname|luciversion)\s*=/); }).map(function(l) { return l.replace(/^\s*\w+\s*=\s*['"]([^'"]+)['"].*$/, '$1'); }).join(' '); -*/ var datestr = null; @@ -76,7 +74,7 @@ return L.Class.extend({ _('Hostname'), boardinfo.hostname, _('Model'), boardinfo.model + cpubench.cpubench, _('CPU Info'), cpuinfo.cpuinfo, - _('Firmware Version'), (L.isObject(boardinfo.release) ? boardinfo.release.description : '')/* + ' / ' : '') + (luciversion || '')*/, + _('Firmware Version'), (L.isObject(boardinfo.release) ? boardinfo.release.description : '') + ' / ' : '') + (luciversion || ''), _('Kernel Version'), boardinfo.kernel, _('Local Time'), datestr, _('Uptime'), systeminfo.uptime ? '%t'.format(systeminfo.uptime) : null, diff --git a/package/lean/default-settings/files/openwrt_banner b/package/lean/default-settings/files/openwrt_banner index 6b57bb794d..3f58fe67d9 100644 --- a/package/lean/default-settings/files/openwrt_banner +++ b/package/lean/default-settings/files/openwrt_banner @@ -7,5 +7,5 @@ │ mm#mm # # # # # # "#m#" # "mm "mm"# "mm │ │ │ │─────────────────────────────────────────────│ -│ ImmortalWrt 21.02 | Mod 21.02 │ +│ ImmortalWrt 21.02 │ └─────────────────────────────────────────────┘ diff --git a/package/lean/default-settings/files/zzz-default-settings b/package/lean/default-settings/files/zzz-default-settings index 0935506f8a..2cfbbea509 100755 --- a/package/lean/default-settings/files/zzz-default-settings +++ b/package/lean/default-settings/files/zzz-default-settings @@ -36,17 +36,6 @@ sed -i '/option disabled/d' /etc/config/wireless sed -i '/set wireless.radio${devidx}.disabled/d' /lib/wifi/mac80211.sh wifi up -# NEVER DROP THE EXISTING AUTHORS INFO | 禁止删除现有作者信息 -sed -i '/DISTRIB_REVISION/d' /etc/openwrt_release -echo "DISTRIB_REVISION=''" >> /etc/openwrt_release -sed -i '/DISTRIB_DESCRIPTION/d' /etc/openwrt_release -echo "DISTRIB_DESCRIPTION='ImmortalWrt 21.02 | Mod 21.02'" >> /etc/openwrt_release - -# NEVER DROP THE EXISTING AUTHORS INFO | 禁止删除现有作者信息 -sed -i 's/LuCI Master/LuCI 21.02 by OpenWrt/g' /usr/lib/lua/luci/version.lua -sed -i '/luciversion/d' /usr/lib/lua/luci/version.lua -echo 'luciversion = "Mod 21.02 by ImmortalWrt"' >> /usr/lib/lua/luci/version.lua - sed -i '/log-facility/d' /etc/dnsmasq.conf echo "log-facility=/dev/null" >> /etc/dnsmasq.conf