Includes IPv6 interface configs only if IPv6 exists (#256)

m-lab · Feb 28, 2024 · b98b0ab · b98b0ab
1 parent 7f12766
commit b98b0ab
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/configs/stage3_ubuntu/opt/mlab/bin/generate_network_config.sh b/configs/stage3_ubuntu/opt/mlab/bin/generate_network_config.sh
@@ -76,10 +76,20 @@ Address=$ADDR_IPv4
 Gateway=$GATEWAY_IPv4
 DNS=$DNS1_IPv4
 DNS=$DNS2_IPv4
+EOF
+
+# Append IPv6 configs, but only if IPv6 configs exist. If there is no IPv6
+# config, then the we would be left with "DNS=", which apparently overrides the
+# previous IPv4 DNS settings, leaving a machine with no configured nameservers,
+# and thus no name resolution.
+if [[ -n $FIELDS_IPv6 ]]; then
+  cat >> $OUTPUT <<EOF
 
 # IPv6
 Address=$ADDR_IPv6
 Gateway=$GATEWAY_IPv6
 DNS=$DNS1_IPv6
 IPv6AcceptRA=no
+
 EOF
+fi