Revert "libnetwork/pasta: pass --dns none"

This reverts commit 92784a2. I plan on using --dns-forward now so we do not want to disable dns by default, see [1]. [1] containers/podman#19213 Signed-off-by: Paul Holzinger <[email protected]>
Luap99 · Mar 14, 2024 · b3fb1c2 · b3fb1c2
1 parent f691bf8
commit b3fb1c2
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/libnetwork/pasta/pasta_linux.go b/libnetwork/pasta/pasta_linux.go
@@ -50,7 +50,6 @@ func Setup2(opts *SetupOptions) (*SetupResult, error) {
 	NoTCPNamespacePorts := true
 	NoUDPNamespacePorts := true
 	NoMapGW := true
-	NoDNS := true
 
 	path, err := opts.Config.FindHelperBinary(BinaryName, true)
 	if err != nil {
@@ -106,8 +105,6 @@ func Setup2(opts *SetupOptions) (*SetupResult, error) {
 			NoMapGW = false
 			// not an actual pasta(1) option
 			cmdArgs = append(cmdArgs[:i], cmdArgs[i+1:]...)
-		case "-D", "--dns", "--dns-forward":
-			NoDNS = false
 		}
 	}
 
@@ -126,12 +123,6 @@ func Setup2(opts *SetupOptions) (*SetupResult, error) {
 	if NoMapGW {
 		cmdArgs = append(cmdArgs, "--no-map-gw")
 	}
-	if NoDNS {
-		// disable pasta reading from /etc/resolv.conf which hides the
-		// "Couldn't get any nameserver address" warning when only
-		// localhost resolvers are configured.
-		cmdArgs = append(cmdArgs, "--dns", "none")
-	}
 
 	// always pass --quiet to silence the info output from pasta
 	cmdArgs = append(cmdArgs, "--quiet", "--netns", opts.Netns)