From 4b1b79e846297abc9921ee38282c2cd57286c3ad Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Thu, 9 May 2024 02:49:01 +0800 Subject: [PATCH] Revert "default-settings: set dnsmasq logfacility via uci config" This reverts commit b0865c82218dfea84ca865a9a6da38571f2cfd9c. Signed-off-by: Tianling Shen (cherry picked from commit b3b46ba4f3afc5dd8f70c0d2aa6604afdafadc2c) --- package/emortal/default-settings/Makefile | 2 +- .../default-settings/files/99-default-settings | 11 ++--------- package/network/services/dnsmasq/files/dhcp.conf | 1 - 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/package/emortal/default-settings/Makefile b/package/emortal/default-settings/Makefile index 5f22488a43..65a6f52a06 100644 --- a/package/emortal/default-settings/Makefile +++ b/package/emortal/default-settings/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=default-settings -PKG_RELEASE:=28 +PKG_RELEASE:=29 PKG_LICENSE:=GPL-2.0-only diff --git a/package/emortal/default-settings/files/99-default-settings b/package/emortal/default-settings/files/99-default-settings index fa02d2fcea..db753461cc 100755 --- a/package/emortal/default-settings/files/99-default-settings +++ b/package/emortal/default-settings/files/99-default-settings @@ -12,15 +12,8 @@ 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 +sed -i "/log-facility/d" "/etc/dnsmasq.conf" +echo "log-facility=/dev/null" >> "/etc/dnsmasq.conf" ln -sf "/sbin/ip" "/usr/bin/ip" diff --git a/package/network/services/dnsmasq/files/dhcp.conf b/package/network/services/dnsmasq/files/dhcp.conf index 5d1cc2bfe0..b5968d77cb 100644 --- a/package/network/services/dnsmasq/files/dhcp.conf +++ b/package/network/services/dnsmasq/files/dhcp.conf @@ -27,7 +27,6 @@ config dnsmasq 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