~统一mihomo和singbox内核fake-ip网段
~优化新手引导 ~修复部分设备安装后没有自动设置默认防火墙应用的bug ~修复部分设备工具列表显示错误的bug
This commit is contained in:
@@ -226,7 +226,7 @@ fi
|
|||||||
setconfig COMMAND "$COMMAND" ${CRASHDIR}/configs/command.env
|
setconfig COMMAND "$COMMAND" ${CRASHDIR}/configs/command.env
|
||||||
#设置防火墙执行模式
|
#设置防火墙执行模式
|
||||||
grep -q 'firewall_mod' "$CRASHDIR/configs/ShellClash.cfg" 2>/dev/null || {
|
grep -q 'firewall_mod' "$CRASHDIR/configs/ShellClash.cfg" 2>/dev/null || {
|
||||||
iptables -j REDIRECT -h >/dev/null 2>&1 && firewall_mod=iptables
|
firewall_mod=iptables
|
||||||
nft add table inet shellcrash 2>/dev/null && firewall_mod=nftables
|
nft add table inet shellcrash 2>/dev/null && firewall_mod=nftables
|
||||||
setconfig firewall_mod $firewall_mod
|
setconfig firewall_mod $firewall_mod
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1990,9 +1990,9 @@ tools() {
|
|||||||
echo -e " 3 \033[36m日志及推送工具\033[0m"
|
echo -e " 3 \033[36m日志及推送工具\033[0m"
|
||||||
[ -f /etc/firewall.user ] && echo -e " 4 \033[32m配置\033[0m外网访问SSH"
|
[ -f /etc/firewall.user ] && echo -e " 4 \033[32m配置\033[0m外网访问SSH"
|
||||||
[ -x /usr/sbin/otapredownload ] && echo -e " 5 \033[33m$mi_update\033[0m小米系统自动更新"
|
[ -x /usr/sbin/otapredownload ] && echo -e " 5 \033[33m$mi_update\033[0m小米系统自动更新"
|
||||||
[ -f ${CRASHDIR}/misnap_init.sh ] && echo -e " 6 小米设备软固化SSH ———— \033[$mi_autoSSH_type \033[0m"
|
[ "$systype" = "mi_snapshot" ] && echo -e " 6 小米设备软固化SSH ———— \033[$mi_autoSSH_type \033[0m"
|
||||||
[ -f /etc/config/ddns ] && echo -e " 7 配置\033[32mDDNS服务\033[0m(需下载相关脚本)"
|
[ -f /etc/config/ddns ] && echo -e " 7 配置\033[32mDDNS服务\033[0m(需下载相关脚本)"
|
||||||
[ -f ${CRASHDIR}/misnap_init.sh ] && echo -e " 8 小米设备Tun模块修复 ———— \033[$mi_tunfix \033[0m"
|
[ "$systype" = "mi_snapshot" ] && echo -e " 8 小米设备Tun模块修复 ———— \033[$mi_tunfix \033[0m"
|
||||||
echo -----------------------------------------------
|
echo -----------------------------------------------
|
||||||
echo -e " 0 返回上级菜单"
|
echo -e " 0 返回上级菜单"
|
||||||
echo -----------------------------------------------
|
echo -----------------------------------------------
|
||||||
@@ -2063,7 +2063,7 @@ tools() {
|
|||||||
rm -rf ${CRASHDIR}/tools/tun.ko
|
rm -rf ${CRASHDIR}/tools/tun.ko
|
||||||
echo -e "\033[33m补丁文件已移除,请立即重启设备以防止出错!\033[0m"
|
echo -e "\033[33m补丁文件已移除,请立即重启设备以防止出错!\033[0m"
|
||||||
}
|
}
|
||||||
elif [ -z "$(modinfo tun)" ]; then
|
elif ckcmd modinfo && [ -z "$(modinfo tun)" ]; then
|
||||||
echo -e "\033[33m本功能需要修改系统文件,不保证没有任何风险!\033[0m"
|
echo -e "\033[33m本功能需要修改系统文件,不保证没有任何风险!\033[0m"
|
||||||
echo -e "\033[33m本功能采集的Tun模块并不一定适用于你的设备!\033[0m"
|
echo -e "\033[33m本功能采集的Tun模块并不一定适用于你的设备!\033[0m"
|
||||||
sleep 1
|
sleep 1
|
||||||
|
|||||||
@@ -410,6 +410,7 @@ dns:
|
|||||||
- 223.5.5.5
|
- 223.5.5.5
|
||||||
enhanced-mode: fake-ip
|
enhanced-mode: fake-ip
|
||||||
fake-ip-range: 28.0.0.1/8
|
fake-ip-range: 28.0.0.1/8
|
||||||
|
fake-ip-range6: fc00::/16
|
||||||
fake-ip-filter:
|
fake-ip-filter:
|
||||||
EOF
|
EOF
|
||||||
if [ "$dns_mod" != "redir_host" ]; then
|
if [ "$dns_mod" != "redir_host" ]; then
|
||||||
@@ -710,8 +711,8 @@ EOF
|
|||||||
{
|
{
|
||||||
"tag": "dns_fakeip",
|
"tag": "dns_fakeip",
|
||||||
"type": "fakeip",
|
"type": "fakeip",
|
||||||
"inet4_range": "198.18.0.0/15",
|
"inet4_range": "28.0.0.1/8",
|
||||||
"inet6_range": "fc00::/18"
|
"inet6_range": "fc00::/16"
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -491,14 +491,14 @@ task_recom(){ #任务推荐
|
|||||||
echo -----------------------------------------------
|
echo -----------------------------------------------
|
||||||
echo -e "每隔10分钟自动保存面板配置"
|
echo -e "每隔10分钟自动保存面板配置"
|
||||||
echo -e "服务启动后自动同步ntp时间"
|
echo -e "服务启动后自动同步ntp时间"
|
||||||
echo -e "在每周3的3点整更新订阅并重启服务"
|
echo -e "在每日的3点0分重启服务"
|
||||||
echo -----------------------------------------------
|
echo -----------------------------------------------
|
||||||
read -p "是否启用?(1/0) > " res
|
read -p "是否启用?(1/0) > " res
|
||||||
[ "$res" = 1 ] && {
|
[ "$res" = 1 ] && {
|
||||||
set_service running "106" "运行时每10分钟自动保存面板配置" "*/10 * * * *"
|
set_service running "106" "运行时每10分钟自动保存面板配置" "*/10 * * * *"
|
||||||
set_service afstart "107" "服务启动后自动同步ntp时间"
|
set_service afstart "107" "服务启动后自动同步ntp时间"
|
||||||
cronset "在每周3的3点整更新订阅并重启服务" "0 3 * * 3 ${CRASHDIR}/task/task.sh 104 在每周3的3点整更新订阅并重启服务" && \
|
cronset "在每日的3点0分重启服务" "0 3 * * * ${CRASHDIR}/task/task.sh 103 在每日的3点0分重启服务" && \
|
||||||
echo -e "任务【在每周3的3点整更新订阅并重启服务】\033[32m添加成功!\033[0m"
|
echo -e "任务【在每日的3点0分重启服务】\033[32m添加成功!\033[0m"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
task_menu(){ #任务菜单
|
task_menu(){ #任务菜单
|
||||||
|
|||||||
@@ -2252,9 +2252,10 @@ userguide(){
|
|||||||
else
|
else
|
||||||
redir_mod="Redir模式"
|
redir_mod="Redir模式"
|
||||||
fi
|
fi
|
||||||
setconfig crashcore "clash"
|
|
||||||
}
|
}
|
||||||
|
setconfig crashcore "mihomo"
|
||||||
setconfig redir_mod "$redir_mod"
|
setconfig redir_mod "$redir_mod"
|
||||||
|
setconfig dns_mod mix
|
||||||
#默认启用绕过CN-IP
|
#默认启用绕过CN-IP
|
||||||
setconfig cn_ip_route 已开启
|
setconfig cn_ip_route 已开启
|
||||||
#自动识别IPV6
|
#自动识别IPV6
|
||||||
|
|||||||
Reference in New Issue
Block a user