Skip to content

Commit

Permalink
Revert "libnetwork/pasta: pass --dns none"
Browse files Browse the repository at this point in the history
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 <pholzing@redhat.com>
  • Loading branch information
Luap99 committed Mar 21, 2024
1 parent a49ced6 commit f03a238
Showing 1 changed file with 0 additions and 9 deletions.
9 changes: 0 additions & 9 deletions libnetwork/pasta/pasta_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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
}
}

Expand All @@ -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)
Expand Down

0 comments on commit f03a238

Please sign in to comment.