OpenWrt/xiaomi-ax3600
1
0
Fork 0
mirror of https://github.com/immortalwrt/immortalwrt.git synced 2025-08-11 06:11:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge Official Source

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen
2025-06-01 19:47:55 +08:00
parent 57f8e83584 ba674fea40
commit fbf5ebf90b
406 changed files with 30150 additions and 14007 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
package/base-files/files/bin/config_generate
View File

@ -3,6 +3,7 @@
CFG=/etc/board.json
. /usr/share/libubox/jshn.sh
. /lib/functions/ipv4.sh
[ -s $CFG ] || /bin/board_detect || exit 1
[ -s /etc/config/network -a -s /etc/config/system ] && exit 0
@ -42,8 +43,7 @@ generate_static_network() {
set network.loopback='interface'
set network.loopback.device='lo'
set network.loopback.proto='static'
set network.loopback.ipaddr='127.0.0.1'
set network.loopback.netmask='255.0.0.0'
add_list network.loopback.ipaddr='127.0.0.1/8'
EOF
[ -e /proc/sys/net/ipv6 ] && {
uci -q batch <<-EOF
@ -160,18 +160,19 @@ generate_network() {
case "$protocol" in
static)
local ipad
local ipad netm prefix
case "$1" in
lan) ipad=${ipaddr:-"192.168.1.1"} ;;
*) ipad=${ipaddr:-"192.168.$((addr_offset++)).1"} ;;
esac
netm=${netmask:-"255.255.255.0"}
str2ip netm "$netm"
netmask2prefix prefix "$netm"
uci -q batch <<-EOF
set network.$1.proto='static'
set network.$1.ipaddr='$ipad'
set network.$1.netmask='$netm'
add_list network.$1.ipaddr='$ipad/$prefix'
EOF
[ -e /proc/sys/net/ipv6 ] && uci set network.$1.ip6assign='60'
;;

3
package/base-files/files/bin/ipcalc.sh
View File

@ -133,8 +133,7 @@ _ip2str START "$start"
_ip2str END "$end"
if [ "$start" -le "$ipaddr" ] && [ "$ipaddr" -le "$end" ]; then
echo "error: address $IP inside range $START..$END" >&2
exit 1
echo "warning: address $IP inside range $START..$END" >&2
fi
echo "START=$START"

2
package/base-files/files/sbin/sysupgrade
View File

@ -278,7 +278,7 @@ create_backup_archive() {
fi
done
disabled="$disabled\nexit 0"
tar_print_member "/etc/uci-defaults/10_disable_services" "$(echo -e $disabled)" || ret=1
tar_print_member "/etc/uci-defaults/10_disable_services" "$(echo -e $disabled)" "$(date -r /etc/rc.d "+%s")" || ret=1
fi
# Part of archive with installed packages info