Merge f3bf5dda15 into 1e7a3bb8f6

getdomains-install.sh

@@ -323,22 +323,18 @@ 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() {
-    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
-    fi
 }
-
 remove_forwarding() {
     if [ ! -z "$forward_id" ]; then
         while uci -q delete firewall.@forwarding[$forward_id]; do :; done

tasks/main.yml

@@ -11,10 +11,6 @@
     register: dnsmasq_confdir
     ignore_errors: true
 
-  - name: Get openwrt major release
-    shell: cat /etc/openwrt_release | grep -Eo [0-9]{2}[.][0-9]{2}[.][0-9]* | cut -d '.' -f 1 | tail -n 1
-    register: openwrt_major_release
-
   - name: debug
     debug:
       var: ansible_distribution_major_version
@@ -78,7 +74,7 @@
       key: dhcp.@dnsmasq[0]
       value:
         confdir: "/tmp/dnsmasq.d"
-    when: dnsmasq_confdir.stdout != "/tmp/dnsmasq.d" and openwrt_major_release >= 24
+    when: dnsmasq_confdir.stdout != "/tmp/dnsmasq.d"
 
 # Getdomains script configure