update 2022-07-26 20:20:56
This commit is contained in:
parent
16083be5a0
commit
f5040dc7df
|
@ -159,6 +159,7 @@ ln_start_bin() {
|
||||||
echolog "-----------end------------"
|
echolog "-----------end------------"
|
||||||
_exit 2
|
_exit 2
|
||||||
}
|
}
|
||||||
|
ulimit -n 1000000
|
||||||
${file_func:-echolog " - ${ln_name}"} "$@" >/dev/null 2>&1 &
|
${file_func:-echolog " - ${ln_name}"} "$@" >/dev/null 2>&1 &
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -847,7 +848,6 @@ start() {
|
||||||
boot() {
|
boot() {
|
||||||
echolog "boot!"
|
echolog "boot!"
|
||||||
mkdir -p /var/run /var/lock /var/log /tmp/dnsmasq.d $TMP_BIN_PATH $TMP_DNSMASQ_PATH
|
mkdir -p /var/run /var/lock /var/log /tmp/dnsmasq.d $TMP_BIN_PATH $TMP_DNSMASQ_PATH
|
||||||
ulimit -n 65535
|
|
||||||
start
|
start
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
version=`uci -q get base_config.@status[0].version`
|
version=`uci -q get base_config.@status[0].version`
|
||||||
|
|
||||||
hostname=`uci -q get system.@system[0].hostname`
|
hostname=`uci -q get system.@system[0].hostname`
|
||||||
test -n "${hostname}" || hostname="OpenWrt"
|
[ -n "${hostname}" ] || hostname="OpenWrt"
|
||||||
|
|
||||||
if [ "$(uci -q get dhcp.@dnsmasq[0].port)" != "53" ]; then
|
if [ "$(uci -q get dhcp.@dnsmasq[0].port)" != "53" ]; then
|
||||||
uci -q set dhcp.@dnsmasq[0].port='53'
|
uci -q set dhcp.@dnsmasq[0].port='53'
|
||||||
|
@ -19,7 +19,7 @@ set attendedsysupgrade.server.url='https://op.supes.top'
|
||||||
commit attendedsysupgrade
|
commit attendedsysupgrade
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
uci set dockerd.firewall.extra_iptables_args='--match conntrack ! --ctstate RELATED,ESTABLISHED'
|
uci -q set dockerd.firewall.extra_iptables_args='--match conntrack ! --ctstate RELATED,ESTABLISHED'
|
||||||
uci commit dockerd
|
uci commit dockerd
|
||||||
|
|
||||||
sed -i '/profile.d/d' /lib/upgrade/keep.d/base-files
|
sed -i '/profile.d/d' /lib/upgrade/keep.d/base-files
|
||||||
|
@ -29,16 +29,15 @@ echo $(uci -q get uhttpd.main.index_page) | grep -q "cgi-bin/luci" ||
|
||||||
|
|
||||||
/etc/init.d/wizard disable
|
/etc/init.d/wizard disable
|
||||||
|
|
||||||
[ -f /usr/bin/wget ] &&
|
|
||||||
ln -s /usr/bin/wget /usr/bin/wget-ssl
|
|
||||||
|
|
||||||
sed -i "s/git-.*-\(.*\)/git-\1/g" /usr/lib/lua/luci/version.lua
|
sed -i "s/git-.*-\(.*\)/git-\1/g" /usr/lib/lua/luci/version.lua
|
||||||
|
|
||||||
|
if [ -f /etc/uwsgi/vassals/luci-webui.ini ]; then
|
||||||
processor=`cat /proc/cpuinfo | grep 'processor' | wc -l`
|
processor=`cat /proc/cpuinfo | grep 'processor' | wc -l`
|
||||||
test -n "$processor" || processor=3
|
[ -n "$processor" ] || processor=3
|
||||||
sed -i "/^threads =/c\threads = $processor" /etc/uwsgi/vassals/luci-webui.ini
|
sed -i "/^threads =/c\threads = $processor" /etc/uwsgi/vassals/luci-webui.ini
|
||||||
|
fi
|
||||||
|
|
||||||
test $version -lt 1 && {
|
if [[ ! "$version" || "$version" -lt 1 ]]; then
|
||||||
uci -q set luci.main.lang='auto'
|
uci -q set luci.main.lang='auto'
|
||||||
uci -q set luci.main.mediaurlbase=/luci-static/edge
|
uci -q set luci.main.mediaurlbase=/luci-static/edge
|
||||||
uci commit luci
|
uci commit luci
|
||||||
|
@ -46,14 +45,14 @@ test $version -lt 1 && {
|
||||||
uci -q set dropbear.@dropbear[0].Interface='lan'
|
uci -q set dropbear.@dropbear[0].Interface='lan'
|
||||||
uci commit dropbear
|
uci commit dropbear
|
||||||
|
|
||||||
uci -q get system.@system[0] >/dev/null 2>&1 && {
|
if uci -q get system.@system[0] >/dev/null; then
|
||||||
uci -q set system.@system[0].zonename='Asia/Shanghai'
|
uci -q set system.@system[0].zonename='Asia/Shanghai'
|
||||||
uci -q set system.@system[0].timezone='CST-8'
|
uci -q set system.@system[0].timezone='CST-8'
|
||||||
uci -q del system.ntp.server
|
uci -q del system.ntp.server
|
||||||
uci -q add_list system.ntp.server='ntp.aliyun.com'
|
uci -q add_list system.ntp.server='ntp.aliyun.com'
|
||||||
uci -q add_list system.ntp.server='0.openwrt.pool.ntp.org'
|
uci -q add_list system.ntp.server='0.openwrt.pool.ntp.org'
|
||||||
uci commit system
|
uci commit system
|
||||||
}
|
fi
|
||||||
|
|
||||||
uci -q set uhttpd.main.rfc1918_filter=0
|
uci -q set uhttpd.main.rfc1918_filter=0
|
||||||
uci -q set uhttpd.main.redirect_https=0
|
uci -q set uhttpd.main.redirect_https=0
|
||||||
|
@ -68,17 +67,17 @@ test $version -lt 1 && {
|
||||||
uci -q set turboacc.config.sfe_flow='1'
|
uci -q set turboacc.config.sfe_flow='1'
|
||||||
uci commit turboacc
|
uci commit turboacc
|
||||||
elif [[ "$DISTRIB_TARGET" != "x86/64" ]]; then
|
elif [[ "$DISTRIB_TARGET" != "x86/64" ]]; then
|
||||||
uci set firewall.@defaults[0].flow_offloading='1'
|
uci -q set firewall.@defaults[0].flow_offloading='1'
|
||||||
uci set firewall.@defaults[0].flow_offloading_hw='1'
|
uci -q set firewall.@defaults[0].flow_offloading_hw='1'
|
||||||
uci commit firewall
|
uci commit firewall
|
||||||
fi
|
fi
|
||||||
|
|
||||||
wifi_setup_radio(){
|
wifi_setup_radio(){
|
||||||
local radio=$1
|
local radio=$1
|
||||||
htmode="$(uci get wireless.${radio}.htmode)"
|
htmode="$(uci -q get wireless.${radio}.htmode)"
|
||||||
local widx=0
|
local widx=0
|
||||||
while uci rename wireless.@wifi-iface[$widx]=default_radio$widx >/dev/null 2>&1; do widx=$((widx+1)); done
|
while uci rename wireless.@wifi-iface[$widx]=default_radio$widx >/dev/null 2>&1; do widx=$((widx+1)); done
|
||||||
uci -q get wireless.${radio} >/dev/null 2>&1 && {
|
if uci -q get wireless.${radio} >/dev/null; then
|
||||||
uci -q del wireless.${radio}.disabled
|
uci -q del wireless.${radio}.disabled
|
||||||
uci -q set wireless.${radio}.country='US'
|
uci -q set wireless.${radio}.country='US'
|
||||||
|
|
||||||
|
@ -91,10 +90,10 @@ test $version -lt 1 && {
|
||||||
uci -q set wireless.${radio}.htmode="VHT80" #AC
|
uci -q set wireless.${radio}.htmode="VHT80" #AC
|
||||||
uci -q set wireless.${radio}.channel="157"
|
uci -q set wireless.${radio}.channel="157"
|
||||||
fi
|
fi
|
||||||
[[ "$(board_name)" =~ (.*cr660x|.*ax9000|.*ax3600) || "$DISTRIB_TARGET" == 'ipq60xx/generic' ]] && {
|
if [[ "$(board_name)" == *cr660x || "$(board_name)" == *ax9000 || "$(board_name)" == *ax3600 || "$DISTRIB_TARGET" == 'ipq60xx/generic' ]]; then
|
||||||
uci -q set wireless.${radio}.htmode="HE80"
|
uci -q set wireless.${radio}.htmode="HE80"
|
||||||
uci -q set wireless.${radio}.channel='157'
|
uci -q set wireless.${radio}.channel='157'
|
||||||
}
|
fi
|
||||||
else
|
else
|
||||||
uci -q set wireless.${radio}.htmode="HT40" #N
|
uci -q set wireless.${radio}.htmode="HT40" #N
|
||||||
uci -q set wireless.${radio}.noscan='1'
|
uci -q set wireless.${radio}.noscan='1'
|
||||||
|
@ -109,10 +108,10 @@ test $version -lt 1 && {
|
||||||
else
|
else
|
||||||
uci -q set wireless.default_${radio}.encryption='none'
|
uci -q set wireless.default_${radio}.encryption='none'
|
||||||
fi
|
fi
|
||||||
}
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
[ -f /etc/config/wireless ] && {
|
if [ -f /etc/config/wireless ]; then
|
||||||
SSID=${hostname}
|
SSID=${hostname}
|
||||||
SSID_PASSWD=""
|
SSID_PASSWD=""
|
||||||
[ "$(uci -q get wireless.radio1.band)" == "5g" ] && uci -q set wireless.radio0.band="2g"
|
[ "$(uci -q get wireless.radio1.band)" == "5g" ] && uci -q set wireless.radio0.band="2g"
|
||||||
|
@ -120,7 +119,7 @@ test $version -lt 1 && {
|
||||||
wifi_setup_radio ${radio}
|
wifi_setup_radio ${radio}
|
||||||
done
|
done
|
||||||
uci commit wireless
|
uci commit wireless
|
||||||
}
|
fi
|
||||||
|
|
||||||
uci -q set upnpd.config.enabled='1'
|
uci -q set upnpd.config.enabled='1'
|
||||||
uci commit upnpd
|
uci commit upnpd
|
||||||
|
@ -128,10 +127,10 @@ test $version -lt 1 && {
|
||||||
grep -q log-facility /etc/dnsmasq.conf ||
|
grep -q log-facility /etc/dnsmasq.conf ||
|
||||||
echo "log-facility=/dev/null" >> /etc/dnsmasq.conf
|
echo "log-facility=/dev/null" >> /etc/dnsmasq.conf
|
||||||
|
|
||||||
[[ -f /sys/module/xt_FULLCONENAT/refcnt || -f /sys/module/nft_fullcone/refcnt ]] && {
|
if [[ -f /sys/module/xt_FULLCONENAT/refcnt || -f /sys/module/nft_fullcone/refcnt ]]; then
|
||||||
uci -q set firewall.@defaults[0].fullcone='1'
|
uci -q set firewall.@defaults[0].fullcone='1'
|
||||||
uci commit firewall
|
uci commit firewall
|
||||||
}
|
fi
|
||||||
|
|
||||||
uci -q set fstab.@global[0].anon_mount=1
|
uci -q set fstab.@global[0].anon_mount=1
|
||||||
uci commit fstab
|
uci commit fstab
|
||||||
|
@ -157,31 +156,31 @@ test $version -lt 1 && {
|
||||||
uci -q set system.@system[0].conloglevel='4'
|
uci -q set system.@system[0].conloglevel='4'
|
||||||
uci -q set system.@system[0].cronloglevel='8'
|
uci -q set system.@system[0].cronloglevel='8'
|
||||||
uci commit system
|
uci commit system
|
||||||
}
|
fi
|
||||||
|
|
||||||
# kB
|
# kB
|
||||||
memtotal=`grep MemTotal /proc/meminfo | awk '{print $2}'`
|
memtotal=`grep MemTotal /proc/meminfo | awk '{print $2}'`
|
||||||
if test $memtotal -ge 1048576; then
|
if [ "$memtotal" -ge 1048576 ]; then
|
||||||
# > 1024M
|
# > 1024M
|
||||||
cachesize=10000
|
cachesize=10000
|
||||||
dnsforwardmax=10000
|
dnsforwardmax=10000
|
||||||
nf_conntrack_max=262144
|
nf_conntrack_max=262144
|
||||||
elif test $memtotal -ge 524288; then
|
elif [ "$memtotal" -ge 524288 ]; then
|
||||||
# <= 1024M
|
# <= 1024M
|
||||||
cachesize=10000
|
cachesize=10000
|
||||||
dnsforwardmax=10000
|
dnsforwardmax=10000
|
||||||
nf_conntrack_max=131072
|
nf_conntrack_max=131072
|
||||||
elif test $memtotal -ge 262144; then
|
elif [ "$memtotal" -ge 262144 ]; then
|
||||||
# <= 512M
|
# <= 512M
|
||||||
cachesize=8192
|
cachesize=8192
|
||||||
dnsforwardmax=8192
|
dnsforwardmax=8192
|
||||||
nf_conntrack_max=65536
|
nf_conntrack_max=65536
|
||||||
elif test $memtotal -ge 131072; then
|
elif [ "$memtotal" -ge 131072 ]; then
|
||||||
# <= 256M
|
# <= 256M
|
||||||
cachesize=4096
|
cachesize=4096
|
||||||
dnsforwardmax=4096
|
dnsforwardmax=4096
|
||||||
nf_conntrack_max=65536
|
nf_conntrack_max=65536
|
||||||
elif test $memtotal -ge 65536; then
|
elif [ "$memtotal" -ge 65536 ]; then
|
||||||
# <= 128M
|
# <= 128M
|
||||||
cachesize=2048
|
cachesize=2048
|
||||||
dnsforwardmax=2048
|
dnsforwardmax=2048
|
||||||
|
@ -193,7 +192,7 @@ else
|
||||||
nf_conntrack_max=16384
|
nf_conntrack_max=16384
|
||||||
fi
|
fi
|
||||||
|
|
||||||
test $version -lt 1 && {
|
if [[ ! "$version" || "$version" -lt 1 ]]; then
|
||||||
uci -q get dhcp.@dnsmasq[0] || uci -q add dhcp dnsmasq
|
uci -q get dhcp.@dnsmasq[0] || uci -q add dhcp dnsmasq
|
||||||
uci -q set dhcp.@dnsmasq[0].cachesize="$cachesize"
|
uci -q set dhcp.@dnsmasq[0].cachesize="$cachesize"
|
||||||
uci -q set dhcp.@dnsmasq[0].dnsforwardmax="$dnsforwardmax"
|
uci -q set dhcp.@dnsmasq[0].dnsforwardmax="$dnsforwardmax"
|
||||||
|
@ -220,7 +219,7 @@ test $version -lt 1 && {
|
||||||
echo kernel.msgmnb = 65536 >>$SYSCTL_LOCAL
|
echo kernel.msgmnb = 65536 >>$SYSCTL_LOCAL
|
||||||
echo vm.swappiness=0 >>$SYSCTL_LOCAL
|
echo vm.swappiness=0 >>$SYSCTL_LOCAL
|
||||||
version=1
|
version=1
|
||||||
}
|
fi
|
||||||
|
|
||||||
cp -pR /www/cgi-bin/* /www/
|
cp -pR /www/cgi-bin/* /www/
|
||||||
rm -rf /tmp/luci-*
|
rm -rf /tmp/luci-*
|
||||||
|
|
|
@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
|
||||||
include $(INCLUDE_DIR)/kernel.mk
|
include $(INCLUDE_DIR)/kernel.mk
|
||||||
|
|
||||||
PKG_NAME:=natflow
|
PKG_NAME:=natflow
|
||||||
PKG_VERSION:=20220611
|
PKG_VERSION:=20220726
|
||||||
|
|
||||||
PKG_SOURCE_URL:=https://codeload.github.com/ptpt52/natflow/tar.gz/$(PKG_VERSION)?
|
PKG_SOURCE_URL:=https://codeload.github.com/ptpt52/natflow/tar.gz/$(PKG_VERSION)?
|
||||||
PKG_HASH:=2dd92f15e4ee753c6af6a09078183e65763a104db5c996250121acf909ea9d23
|
PKG_HASH:=845329cb9d5e9decd9fea10f56d7d5ceb3333018789a5ec6ef2c3be634bfe6c9
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
|
|
||||||
PKG_MAINTAINER:=Chen Minqiang <ptpt52@gmail.com>
|
PKG_MAINTAINER:=Chen Minqiang <ptpt52@gmail.com>
|
||||||
|
@ -25,6 +25,7 @@ define KernelPackage/natflow
|
||||||
SUBMENU:=Fast Forward Stacks
|
SUBMENU:=Fast Forward Stacks
|
||||||
TITLE:=natflow kernel driver
|
TITLE:=natflow kernel driver
|
||||||
KCONFIG:= \
|
KCONFIG:= \
|
||||||
|
CONFIG_NF_CONNTRACK_MARK=y \
|
||||||
CONFIG_NETFILTER_INGRESS=y
|
CONFIG_NETFILTER_INGRESS=y
|
||||||
FILES:=$(PKG_BUILD_DIR)/natflow.ko
|
FILES:=$(PKG_BUILD_DIR)/natflow.ko
|
||||||
AUTOLOAD:=$(call AutoLoad,96,natflow)
|
AUTOLOAD:=$(call AutoLoad,96,natflow)
|
||||||
|
|
Loading…
Reference in New Issue