浏览代码

Remove ipv6 entries if they're not available

Bob Mottram 8 年前
父节点
当前提交
ae961d3bc3
共有 1 个文件被更改,包括 7 次插入3 次删除
  1. 7
    3
      src/freedombone-app-pihole

+ 7
- 3
src/freedombone-app-pihole 查看文件

87
         write_config_param "PIHOLE_IFACE" "$PIHOLE_IFACE"
87
         write_config_param "PIHOLE_IFACE" "$PIHOLE_IFACE"
88
     fi
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
     setupVars=$piholeDir/setupVars.conf
93
     setupVars=$piholeDir/setupVars.conf
94
     echo "piholeInterface=${PIHOLE_IFACE}" > ${setupVars}
94
     echo "piholeInterface=${PIHOLE_IFACE}" > ${setupVars}
110
     sed -i "s|@DNS2@|${PIHOLE_DNS2}|g" /etc/dnsmasq.d/01-pihole.conf
110
     sed -i "s|@DNS2@|${PIHOLE_DNS2}|g" /etc/dnsmasq.d/01-pihole.conf
111
     sed -i "s|interface=.*|interface=${PIHOLE_IFACE}|g" /etc/dnsmasq.d/01-pihole.conf
111
     sed -i "s|interface=.*|interface=${PIHOLE_IFACE}|g" /etc/dnsmasq.d/01-pihole.conf
112
     sed -i "s|@IPv4@|${IPv4_address}|g" /etc/dnsmasq.d/01-pihole.conf
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
     sed -i "s|@HOSTNAME@|$HOSTNAME|g" /etc/dnsmasq.d/01-pihole.conf
118
     sed -i "s|@HOSTNAME@|$HOSTNAME|g" /etc/dnsmasq.d/01-pihole.conf
115
 
119
 
116
     systemctl restart dnsmasq
120
     systemctl restart dnsmasq