diff options
| -rw-r--r-- | libpod/container_internal_linux.go | 5 | ||||
| -rw-r--r-- | pkg/util/utils.go | 24 |
2 files changed, 11 insertions, 18 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index 86a28c176..3bdf28e8c 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -1383,6 +1383,11 @@ func (c *Container) generateResolvConf() (string, error) { return "", err } + // Determine if symlink points to any of the systemd-resolved files + if strings.HasPrefix(resolvPath, "/run/systemd/resolve/") { + resolvPath = "/run/systemd/resolve/resolv.conf" + } + contents, err := ioutil.ReadFile(resolvPath) if err != nil { return "", errors.Wrapf(err, "unable to read %s", resolvPath) diff --git a/pkg/util/utils.go b/pkg/util/utils.go index 82282a549..7612d3012 100644 --- a/pkg/util/utils.go +++ b/pkg/util/utils.go @@ -537,33 +537,21 @@ func OpenExclusiveFile(path string) (*os.File, error) { return os.OpenFile(path, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0666) } -// PullType whether to pull new image -type PullType int +type PullType = config.PullPolicy -const ( +var ( // PullImageAlways always try to pull new image when create or run - PullImageAlways PullType = iota + PullImageAlways = config.PullImageAlways // PullImageMissing pulls image if it is not locally - PullImageMissing + PullImageMissing = config.PullImageMissing // PullImageNever will never pull new image - PullImageNever + PullImageNever = config.PullImageNever ) // ValidatePullType check if the pullType from CLI is valid and returns the valid enum type // if the value from CLI is invalid returns the error func ValidatePullType(pullType string) (PullType, error) { - switch pullType { - case "always": - return PullImageAlways, nil - case "missing", "IfNotPresent": - return PullImageMissing, nil - case "never": - return PullImageNever, nil - case "": - return PullImageMissing, nil - default: - return PullImageMissing, errors.Errorf("invalid pull type %q", pullType) - } + return config.ValidatePullPolicy(pullType) } // ExitCode reads the error message when failing to executing container process |