1.修改系统banner 加入自定义的tag
修改文件: package/base-files/files/etc/banner
%D: 是主机名字
%C: 是git 提交commit的 号
%a:是git tag 版本号
例如:ssh 登录板卡之后的返回banner 内容
2. 添加普通用户及root密码
修改文件list:
package/base-files/files/etc/group
package/base-files/files/etc/group-
package/base-files/files/etc/inittab
package/base-files/files/etc/passwd
package/base-files/files/etc/passwd-
package/base-files/files/etc/shadow
package/base-files/files/etc/shadow-
步骤:
先用password命令再板卡内部设置root密码及添加新用户名字;
最后将文件系统的动部分合入代码库中即可;
完整patch如下:
commit feb591e9babe2aa5f87b368c5bc3a01454f05b01
Author: YangQuan <yangquan@runaiot.com>
Date: Mon Oct 12 20:34:18 2020 -0700
1.add banner runaiota ;2.add user runaiot ; 3.add root passwd refs:#88
diff --git a/include/version.mk b/include/version.mk
index 7d3c1ad6..3e7c5679 100644
--- a/include/version.mk
+++ b/include/version.mk
@@ -31,15 +31,17 @@ VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),SNAPSHOT)
VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))
VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION))
-VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO))
+VERSION_TAG:=$(shell git tag | head -n 1)
+
+VERSION_REO:=$(call qstrip,$(CONFIG_VERSION_REPO))
VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/snapshots)
VERSION_DIST:=$(call qstrip,$(CONFIG_VERSION_DIST))
-VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),OpenWrt)
+VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),RunaIot)
VERSION_DIST_SANITIZED:=$(call sanitize,$(VERSION_DIST))
VERSION_MANUFACTURER:=$(call qstrip,$(CONFIG_VERSION_MANUFACTURER))
-VERSION_MANUFACTURER:=$(if $(VERSION_MANUFACTURER),$(VERSION_MANUFACTURER),OpenWrt)
+VERSION_MANUFACTURER:=$(if $(VERSION_MANUFACTURER),$(VERSION_MANUFACTURER),RunaIot)
VERSION_MANUFACTURER_URL:=$(call qstrip,$(CONFIG_VERSION_MANUFACTURER_URL))
VERSION_MANUFACTURER_URL:=$(if $(VERSION_MANUFACTURER_URL),$(VERSION_MANUFACTURER_URL),https://openwrt.org/)
@@ -57,7 +59,7 @@ VERSION_PRODUCT:=$(call qstrip,$(CONFIG_VERSION_PRODUCT))
VERSION_PRODUCT:=$(if $(VERSION_PRODUCT),$(VERSION_PRODUCT),Generic)
VERSION_HWREV:=$(call qstrip,$(CONFIG_VERSION_HWREV))
-VERSION_HWREV:=$(if $(VERSION_HWREV),$(VERSION_HWREV),v0)
+VERSION_HWREV:=$(if $(VERSION_HWREV),$(VERSION_HWREV),v1.0)
define taint2sym
$(CONFIG_$(firstword $(subst :, ,$(subst +,,$(subst -,,$(1))))))
@@ -107,5 +109,6 @@ VERSION_SED_SCRIPT:=$(SED) 's,%U,$(call sed_escape,$(VERSION_REPO)),g' \
-e 's,%u,$(call sed_escape,$(VERSION_HOME_URL)),g' \
-e 's,%s,$(call sed_escape,$(VERSION_SUPPORT_URL)),g' \
-e 's,%P,$(call sed_escape,$(VERSION_PRODUCT)),g' \
- -e 's,%h,$(call sed_escape,$(VERSION_HWREV)),g'
+ -e 's,%h,$(call sed_escape,$(VERSION_HWREV)),g' \
+ -e 's,%a,$(call sed_escape,$(VERSION_TAG)),g'
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index d32bae86..293c95cc 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -172,6 +172,7 @@ define Package/base-files/install
mkdir -p $(1)/sys
mkdir -p $(1)/www
mkdir -p $(1)/root
+ mkdir -pv $(1)/home/runaiot
$(LN) /proc/mounts $(1)/etc/mtab
rm -f $(1)/var
$(LN) tmp $(1)/var
diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate
index abb1388b..3f603492 100755
--- a/package/base-files/files/bin/config_generate
+++ b/package/base-files/files/bin/config_generate
@@ -241,7 +241,7 @@ generate_static_system() {
uci -q batch <<-EOF
delete system.@system[0]
add system system
- set system.@system[-1].hostname='OpenWrt'
+ set system.@system[-1].hostname='RunaIot'
set system.@system[-1].timezone='UTC'
set system.@system[-1].ttylogin='0'
set system.@system[-1].log_size='64'
diff --git a/package/base-files/files/etc/banner b/package/base-files/files/etc/banner
index f3af3c01..9739c872 100644
--- a/package/base-files/files/etc/banner
+++ b/package/base-files/files/etc/banner
@@ -1,8 +1,11 @@
- _______ ________ __
- | |.-----.-----.-----.| | | |.----.| |_
- | - || _ | -__| || | | || _|| _|
- |_______|| __|_____|__|__||________||__| |____|
- |__| W I R E L E S S F R E E D O M
- -----------------------------------------------------
- %D %V, %C
- -----------------------------------------------------
+ _____ _ _ _ _ _____ ____ _______
+| __ \| | | | \ | | /\ |_ _/ __ \__ __|
+| |__) | | | | \| | / \ | || | | | | |
+| _ /| | | | . ` | / /\ \ | || | | | | |
+| | \ \| |__| | |\ |/ ____ \ _| || |__| | | |
+|_| \_\\____/|_| \_/_/ \_\_____\____/ |_|
+
+----------------------------------------------------------------------------
+%D, %C, %a
+----------------------------------------------------------------------------
+
diff --git a/package/base-files/files/etc/group b/package/base-files/files/etc/group
index 5b06dc6d..c04b7206 100644
--- a/package/base-files/files/etc/group
+++ b/package/base-files/files/etc/group
@@ -9,3 +9,5 @@ ftp:x:55:
users:x:100:
network:x:101:
nogroup:x:65534:
+dnsmasq:x:453:dnsmasq
+runaiot:!:1000:
diff --git a/package/base-files/files/etc/group- b/package/base-files/files/etc/group-
new file mode 100644
index 00000000..016a7dc9
--- /dev/null
+++ b/package/base-files/files/etc/group-
@@ -0,0 +1,12 @@
+root:x:0:
+daemon:x:1:
+adm:x:4:
+mail:x:8:
+dialout:x:20:
+audio:x:29:
+www-data:x:33:
+ftp:x:55:
+users:x:100:
+network:x:101:
+nogroup:x:65534:
+dnsmasq:x:453:dnsmasq
diff --git a/package/base-files/files/etc/inittab b/package/base-files/files/etc/inittab
index 9820e714..f7611b73 100644
--- a/package/base-files/files/etc/inittab
+++ b/package/base-files/files/etc/inittab
@@ -1,3 +1,7 @@
+# Copyright (c) 2013 The Linux Foundation. All rights reserved.
::sysinit:/etc/init.d/rcS S boot
::shutdown:/etc/init.d/rcS K shutdown
-::askconsole:/usr/libexec/login.sh
+ttyMSM0::askfirst:/bin/login
+#ttyMSM0::askfirst:/usr/libexec/login.sh
+ttyMSM1::askfirst:/usr/libexec/login.shutdown
+::askconsole:/bin/login
diff --git a/package/base-files/files/etc/passwd b/package/base-files/files/etc/passwd
index 1d06a803..0eb7314d 100644
--- a/package/base-files/files/etc/passwd
+++ b/package/base-files/files/etc/passwd
@@ -3,3 +3,5 @@ daemon:*:1:1:daemon:/var:/bin/false
ftp:*:55:55:ftp:/home/ftp:/bin/false
network:*:101:101:network:/var:/bin/false
nobody:*:65534:65534:nobody:/var:/bin/false
+dnsmasq:x:453:453:dnsmasq:/var/run/dnsmasq:/bin/false
+runaiot:x:1000:1000::/home/runaiot:/bin/ash
diff --git a/package/base-files/files/etc/passwd- b/package/base-files/files/etc/passwd-
new file mode 100644
index 00000000..0eb7314d
--- /dev/null
+++ b/package/base-files/files/etc/passwd-
@@ -0,0 +1,7 @@
+root:x:0:0:root:/root:/bin/ash
+daemon:*:1:1:daemon:/var:/bin/false
+ftp:*:55:55:ftp:/home/ftp:/bin/false
+network:*:101:101:network:/var:/bin/false
+nobody:*:65534:65534:nobody:/var:/bin/false
+dnsmasq:x:453:453:dnsmasq:/var/run/dnsmasq:/bin/false
+runaiot:x:1000:1000::/home/runaiot:/bin/ash
diff --git a/package/base-files/files/etc/shadow b/package/base-files/files/etc/shadow
index 4b4154f2..8ffce7ec 100644
--- a/package/base-files/files/etc/shadow
+++ b/package/base-files/files/etc/shadow
@@ -1,5 +1,7 @@
-root::0:0:99999:7:::
+root:$1$t39BwlvT$4lU/qbAf3tmEKsZmf7oaU/:18529:0:99999:7:::
daemon:*:0:0:99999:7:::
ftp:*:0:0:99999:7:::
network:*:0:0:99999:7:::
nobody:*:0:0:99999:7:::
+dnsmasq:x:0:0:99999:7:::
+runaiot:$1$sNcm/EVU$pc8ZBMcQ1Q4ocewSx0qwc/:18529:0:99999:7:::
diff --git a/package/base-files/files/etc/shadow- b/package/base-files/files/etc/shadow-
new file mode 100644
index 00000000..62c75e3b
--- /dev/null
+++ b/package/base-files/files/etc/shadow-
@@ -0,0 +1,7 @@
+root:$1$t39BwlvT$4lU/qbAf3tmEKsZmf7oaU/:18529:0:99999:7:::
+daemon:*:0:0:99999:7:::
+ftp:*:0:0:99999:7:::
+network:*:0:0:99999:7:::
+nobody:*:0:0:99999:7:::
+dnsmasq:x:0:0:99999:7:::
+runaiot:!:18529:0:99999:7:::
diff --git a/package/base-files/files/usr/lib/os-release b/package/base-files/files/usr/lib/os-release
index c39913d5..53b62368 100644
--- a/package/base-files/files/usr/lib/os-release
+++ b/package/base-files/files/usr/lib/os-release
@@ -1,18 +1,18 @@
-NAME="%D"
-VERSION="%V"
-ID="%d"
+NAME="RunaIot"
+VERSION="SNAPSHOT"
+ID="runaiot"
ID_LIKE="lede openwrt"
-PRETTY_NAME="%D %V"
-VERSION_ID="%v"
-HOME_URL="%u"
-BUG_URL="%b"
-SUPPORT_URL="%s"
-BUILD_ID="%R"
-OPENWRT_BOARD="%S"
-OPENWRT_ARCH="%A"
-OPENWRT_TAINTS="%t"
-OPENWRT_DEVICE_MANUFACTURER="%M"
-OPENWRT_DEVICE_MANUFACTURER_URL="%m"
-OPENWRT_DEVICE_PRODUCT="%P"
-OPENWRT_DEVICE_REVISION="%h"
-OPENWRT_RELEASE="%D %V %C"
+PRETTY_NAME="RunaIot SNAPSHOT"
+VERSION_ID="snapshot"
+HOME_URL="https://openwrt.org/"
+BUG_URL="https://bugs.openwrt.org/"
+SUPPORT_URL="https://forum.openwrt.org/"
+BUILD_ID="mesh-station-release-v1.1.0"
+OPENWRT_BOARD="ipq40xx/generic"
+OPENWRT_ARCH="arm_cortex-a7_neon-vfpv4"
+OPENWRT_TAINTS="no-all busybox"
+OPENWRT_DEVICE_MANUFACTURER="RunaIot"
+OPENWRT_DEVICE_MANUFACTURER_URL="https://openwrt.org/"
+OPENWRT_DEVICE_PRODUCT="Generic"
+OPENWRT_DEVICE_REVISION="v0"
+OPENWRT_RELEASE="RunaIot VERSION mesh-station-release-v1.1.0"
diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in
index 3432db52..d82da49e 100644
--- a/package/base-files/image-config.in
+++ b/package/base-files/image-config.in
@@ -192,13 +192,13 @@ if VERSIONOPT
%v .. Configured release version number or "snapshot", lowercase
%C .. Configured release revision code or value of %R, uppercase
%c .. Configured release revision code or value of %R, lowercase
- %D .. Distribution name or "OpenWrt", uppercase
- %d .. Distribution name or "openwrt", lowercase
+ %D .. Distribution name or "RunaIot", uppercase
+ %d .. Distribution name or "RunaIot", lowercase
%T .. Target name
%S .. Target/Subtarget name
%A .. Package architecture
%t .. Build taint flags, e.g. "no-all busybox"
- %M .. Manufacturer name or "OpenWrt"
+ %M .. Manufacturer name or "RunaIot"
%P .. Product name or "Generic"
%h .. Hardware revision or "v0"
diff --git a/target/linux/ipq40xx/base-files/etc/inittab b/target/linux/ipq40xx/base-files/etc/inittab
index 3181021a..f7611b73 100644
--- a/target/linux/ipq40xx/base-files/etc/inittab
+++ b/target/linux/ipq40xx/base-files/etc/inittab
@@ -1,5 +1,7 @@
# Copyright (c) 2013 The Linux Foundation. All rights reserved.
::sysinit:/etc/init.d/rcS S boot
::shutdown:/etc/init.d/rcS K shutdown
-ttyMSM0::askfirst:/usr/libexec/login.sh
-ttyMSM1::askfirst:/usr/libexec/login.sh
+ttyMSM0::askfirst:/bin/login
+#ttyMSM0::askfirst:/usr/libexec/login.sh
+ttyMSM1::askfirst:/usr/libexec/login.shutdown
+::askconsole:/bin/login