Bob Mottram 8 лет назад
Родитель
Сommit
d9e945b5e7
1 измененных файлов: 2 добавлений и 2 удалений
  1. 2
    2
      src/freedombone-app-pihole

+ 2
- 2
src/freedombone-app-pihole Просмотреть файл

79
         return
79
         return
80
     fi
80
     fi
81
 
81
 
82
-    if [[ $(config_param_exists WIFI_INTERFACE) == "0" ]]; then
82
+    if [ ! -f $HOME/${PROJECT_NAME}-wifi.cfg ]; then
83
         PIHOLE_IFACE=eth0
83
         PIHOLE_IFACE=eth0
84
     else
84
     else
85
         read_config_param WIFI_INTERFACE
85
         read_config_param WIFI_INTERFACE
86
         PIHOLE_IFACE=$WIFI_INTERFACE
86
         PIHOLE_IFACE=$WIFI_INTERFACE
87
-        write_config_param "PIHOLE_IFACE" "$PIHOLE_IFACE"
88
     fi
87
     fi
89
 
88
 
90
     IPv4_address="$(get_ipv4_address)"
89
     IPv4_address="$(get_ipv4_address)"
116
         sed -i '/@IPv6@/d' /etc/dnsmasq.d/01-pihole.conf
115
         sed -i '/@IPv6@/d' /etc/dnsmasq.d/01-pihole.conf
117
     fi
116
     fi
118
     sed -i "s|@HOSTNAME@|$HOSTNAME|g" /etc/dnsmasq.d/01-pihole.conf
117
     sed -i "s|@HOSTNAME@|$HOSTNAME|g" /etc/dnsmasq.d/01-pihole.conf
118
+    sed -i "s|addn-hosts=.*|addn-hosts=${PIHOLE_ADLIST}|g" /etc/dnsmasq.d/01-pihole.conf
119
 
119
 
120
     systemctl restart dnsmasq
120
     systemctl restart dnsmasq
121
 
121