Просмотр исходного кода

Remove ipv6 entries if they're not available

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

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

@@ -87,8 +87,8 @@ function pihole_update {
87 87
         write_config_param "PIHOLE_IFACE" "$PIHOLE_IFACE"
88 88
     fi
89 89
 
90
-    IPv4_address=$(get_ipv4_address)
91
-    IPv6_address=$(get_ipv6_address)
90
+    IPv4_address="$(get_ipv4_address)"
91
+    IPv6_address="$(get_ipv6_address)"
92 92
 
93 93
     setupVars=$piholeDir/setupVars.conf
94 94
     echo "piholeInterface=${PIHOLE_IFACE}" > ${setupVars}
@@ -110,7 +110,11 @@ function pihole_update {
110 110
     sed -i "s|@DNS2@|${PIHOLE_DNS2}|g" /etc/dnsmasq.d/01-pihole.conf
111 111
     sed -i "s|interface=.*|interface=${PIHOLE_IFACE}|g" /etc/dnsmasq.d/01-pihole.conf
112 112
     sed -i "s|@IPv4@|${IPv4_address}|g" /etc/dnsmasq.d/01-pihole.conf
113
-    sed -i "s|@IPv6@|${IPv6_address}|g" /etc/dnsmasq.d/01-pihole.conf
113
+    if [ ${#IPv6_address} -gt 0 ]; then
114
+        sed -i "s|@IPv6@|${IPv6_address}|g" /etc/dnsmasq.d/01-pihole.conf
115
+    else
116
+        sed -i '/@IPv6@/d' /etc/dnsmasq.d/01-pihole.conf
117
+    fi
114 118
     sed -i "s|@HOSTNAME@|$HOSTNAME|g" /etc/dnsmasq.d/01-pihole.conf
115 119
 
116 120
     systemctl restart dnsmasq