diff --git a/package/emortal/default-settings/Makefile b/package/emortal/default-settings/Makefile index aa2f0116aa..5f22488a43 100644 --- a/package/emortal/default-settings/Makefile +++ b/package/emortal/default-settings/Makefile @@ -1,19 +1,14 @@ +# SPDX-License-Identifier: GPL-2.0-only # # Copyright (C) 2021 Lean -# -# Copyright (C) 2021 ImmortalWrt -# -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2021-2024 ImmortalWrt.org include $(TOPDIR)/rules.mk PKG_NAME:=default-settings -PKG_RELEASE:=27 +PKG_RELEASE:=28 -PKG_LICENSE:=GPL-3.0 +PKG_LICENSE:=GPL-2.0-only include $(INCLUDE_DIR)/package.mk diff --git a/package/emortal/default-settings/files/99-default-settings b/package/emortal/default-settings/files/99-default-settings index 8cf2dbac69..fa02d2fcea 100755 --- a/package/emortal/default-settings/files/99-default-settings +++ b/package/emortal/default-settings/files/99-default-settings @@ -12,13 +12,16 @@ if ! uci -q get system.@imm_init[0].lang > "/dev/null"; then EOF fi +if ! uci -q get system.@imm_init[0].dhcp > "/dev/null"; then + uci -q batch <<-EOF + set dhcp.@dnsmasq[0].logfacility="/dev/null" + commit dhcp + + set system.@imm_init[0].dhcp="1" + commit system + EOF +fi + ln -sf "/sbin/ip" "/usr/bin/ip" -sed -i "/log-facility/d" "/etc/dnsmasq.conf" -echo "log-facility=/dev/null" >> "/etc/dnsmasq.conf" - -rm -f "/www/luci-static/resources/view/status/include/29_ethinfo.js" -rm -f "/tmp/luci-indexcache" -rm -rf "/tmp/luci-modulecache" - exit 0 diff --git a/package/network/services/dnsmasq/files/dhcp.conf b/package/network/services/dnsmasq/files/dhcp.conf index 20f7a85941..5d1cc2bfe0 100644 --- a/package/network/services/dnsmasq/files/dhcp.conf +++ b/package/network/services/dnsmasq/files/dhcp.conf @@ -9,8 +9,10 @@ config dnsmasq option local '/lan/' option domain 'lan' option expandhosts 1 - option nonegcache 0 + option min_cache_ttl 3600 + option use_stale_cache 3600 option cachesize 8000 + option nonegcache 1 option authoritative 1 option readethers 1 option leasefile '/tmp/dhcp.leases' @@ -21,11 +23,11 @@ config dnsmasq #list notinterface lo #list bogusnxdomain '64.94.110.11' option localservice 1 # disable to allow DNS requests from non-local subnets - option min_cache_ttl 3600 option dns_redirect 1 option ednspacket_max 1232 option filter_aaaa 0 option filter_a 0 + option logfacility /dev/null #list addnmount /some/path # read-only mount path to expose it to dnsmasq config dhcp lan