diff --git a/getdomains-install.sh b/getdomains-install.sh index e7fe8ea..130be08 100755 --- a/getdomains-install.sh +++ b/getdomains-install.sh @@ -323,18 +323,22 @@ dnsmasqfull() { 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 -fi + fi } dnsmasqconfdir() { - if uci get dhcp.@dnsmasq[0].confdir | grep -q /tmp/dnsmasq.d; then - printf "\033[32;1mconfdir alreadt set\033[0m\n" - else - printf "\033[32;1mSetting confdir\033[0m\n" - uci set dhcp.@dnsmasq[0].confdir='/tmp/dnsmasq.d' - uci commit dhcp -fi + openwrt_release=$(cat /etc/openwrt_release | grep -Eo [0-9]{2}[.][0-9]{2}[.][0-9]* | cut -d '.' -f 1 | tail -n 1) + if [ $openwrt_release -ge 24 ]; then + if uci get dhcp.@dnsmasq[0].confdir | grep -q /tmp/dnsmasq.d; then + printf "\033[32;1mconfdir alreadt set\033[0m\n" + else + printf "\033[32;1mSetting confdir\033[0m\n" + uci set dhcp.@dnsmasq[0].confdir='/tmp/dnsmasq.d' + uci commit dhcp + fi + fi } + remove_forwarding() { if [ ! -z "$forward_id" ]; then while uci -q delete firewall.@forwarding[$forward_id]; do :; done