diff options
| author | Valentin Rothberg <rothberg@redhat.com> | 2019-06-24 11:29:13 +0200 |
|---|---|---|
| committer | Valentin Rothberg <rothberg@redhat.com> | 2019-06-24 13:20:59 +0200 |
| commit | d697456dc90adbaf68224ed7c115b38d5855e582 (patch) | |
| tree | 5fd88c48b34e7bead0028fa97e39f43f03880642 /vendor/github.com/docker/libnetwork/resolvconf | |
| parent | a3211b73c62a9fcc13f09305bf629ef507b26d34 (diff) | |
| download | podman-d697456dc90adbaf68224ed7c115b38d5855e582.tar.gz podman-d697456dc90adbaf68224ed7c115b38d5855e582.tar.bz2 podman-d697456dc90adbaf68224ed7c115b38d5855e582.zip | |
migrate to go-modules
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'vendor/github.com/docker/libnetwork/resolvconf')
| -rw-r--r-- | vendor/github.com/docker/libnetwork/resolvconf/resolvconf.go | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/vendor/github.com/docker/libnetwork/resolvconf/resolvconf.go b/vendor/github.com/docker/libnetwork/resolvconf/resolvconf.go index 23caf7f12..5cb251b13 100644 --- a/vendor/github.com/docker/libnetwork/resolvconf/resolvconf.go +++ b/vendor/github.com/docker/libnetwork/resolvconf/resolvconf.go @@ -14,11 +14,6 @@ import ( "github.com/sirupsen/logrus" ) -const ( - // DefaultResolvConf points to the default file used for dns configuration on a linux machine - DefaultResolvConf = "/etc/resolv.conf" -) - var ( // Note: the default IPv4 & IPv6 resolvers are set to Google's Public DNS defaultIPv4Dns = []string{"nameserver 8.8.8.8", "nameserver 8.8.4.4"} @@ -55,7 +50,15 @@ type File struct { // Get returns the contents of /etc/resolv.conf and its hash func Get() (*File, error) { - return GetSpecific(DefaultResolvConf) + resolv, err := ioutil.ReadFile("/etc/resolv.conf") + if err != nil { + return nil, err + } + hash, err := ioutils.HashData(bytes.NewReader(resolv)) + if err != nil { + return nil, err + } + return &File{Content: resolv, Hash: hash}, nil } // GetSpecific returns the contents of the user specified resolv.conf file and its hash |