jeka/ansible-openwrt-hirkn
1
0
Fork 0
mirror of https://github.com/itdoginfo/ansible-openwrt-hirkn.git synced 2025-12-14 02:54:29 +05:00
Code Issues Packages Projects Releases Wiki Activity

Execute confdir only for 24 and newer versions

Browse Source
This commit is contained in:
Akiyamov
2024-12-05 15:55:03 +05:00
committed by GitHub
parent f3bf5dda15
commit 7b1f1631b3
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
getdomains-install.sh
View File

@@ -323,18 +323,22 @@ dnsmasqfull() {
opkg remove dnsmasq && opkg install dnsmasq-full --cache /tmp/ opkg remove dnsmasq && opkg install dnsmasq-full --cache /tmp/
[ -f /etc/config/dhcp-opkg ] && cp /etc/config/dhcp /etc/config/dhcp-old && mv /etc/config/dhcp-opkg /etc/config/dhcp [ -f /etc/config/dhcp-opkg ] && cp /etc/config/dhcp /etc/config/dhcp-old && mv /etc/config/dhcp-opkg /etc/config/dhcp
fi fi
} }
dnsmasqconfdir() { dnsmasqconfdir() {
if uci get dhcp.@dnsmasq[0].confdir | grep -q /tmp/dnsmasq.d; then openwrt_release=$(cat /etc/openwrt_release | grep -Eo [0-9]{2}[.][0-9]{2}[.][0-9]* | cut -d '.' -f 1 | tail -n 1)
printf "\033[32;1mconfdir alreadt set\033[0m\n" if [ $openwrt_release -ge 24 ]; then
else if uci get dhcp.@dnsmasq[0].confdir | grep -q /tmp/dnsmasq.d; then
printf "\033[32;1mSetting confdir\033[0m\n" printf "\033[32;1mconfdir alreadt set\033[0m\n"
uci set dhcp.@dnsmasq[0].confdir='/tmp/dnsmasq.d' else
uci commit dhcp printf "\033[32;1mSetting confdir\033[0m\n"
fi uci set dhcp.@dnsmasq[0].confdir='/tmp/dnsmasq.d'
uci commit dhcp
fi
fi
} }
remove_forwarding() { remove_forwarding() {
if [ ! -z "$forward_id" ]; then if [ ! -z "$forward_id" ]; then
while uci -q delete firewall.@forwarding[$forward_id]; do :; done while uci -q delete firewall.@forwarding[$forward_id]; do :; done