Merge pull request #1962 from neowu/master

fix: cidata should respect DNS settings in lima.yaml

Author: jandubois

pkg/cidata/cidata.go

@@ -265,16 +265,17 @@ func GenerateISO9660(instDir, name string, y *limayaml.LimaYAML, udpDNSLocalPort
 	if err != nil {
 		return err
 	}
-	if firstUsernetIndex != -1 || *y.VMType == limayaml.VZ {
+
+	if len(y.DNS) > 0 {
+		for _, addr := range y.DNS {
+			args.DNSAddresses = append(args.DNSAddresses, addr.String())
+		}
+	} else if firstUsernetIndex != -1 || *y.VMType == limayaml.VZ {
 		args.DNSAddresses = append(args.DNSAddresses, args.SlirpDNS)
 	} else if *y.HostResolver.Enabled {
 		args.UDPDNSLocalPort = udpDNSLocalPort
 		args.TCPDNSLocalPort = tcpDNSLocalPort
 		args.DNSAddresses = append(args.DNSAddresses, args.SlirpDNS)
-	} else if len(y.DNS) > 0 {
-		for _, addr := range y.DNS {
-			args.DNSAddresses = append(args.DNSAddresses, addr.String())
-		}
 	} else {
 		args.DNSAddresses, err = osutil.DNSAddresses()
 		if err != nil {