opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-23 01:57:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ensure resolv.conf has the right label and path

Browse Source 
Adds a few missing things from writeStringToRundir() to the new
resolv.conf function, specifically relabelling and returning a
path compatible with rootless podman

Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
This commit is contained in:
Matthew Heon
2018-10-04 17:38:09 -04:00
parent ae5af67d61
commit e9ab8583d0
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/container_easyjson.go
View File

@ -1,3 +1,5 @@
// +build seccomp ostree selinux varlink exclude_graphdriver_devicemapper
// Code generated by easyjson for marshaling/unmarshaling. DO NOT EDIT. // Code generated by easyjson for marshaling/unmarshaling. DO NOT EDIT.
package libpod package libpod

7
libpod/container_internal.go
View File

@ -1068,7 +1068,12 @@ func (c *Container) generateResolvConf() (string, error) {
return "", errors.Wrapf(err, "error building resolv.conf for container %s") return "", errors.Wrapf(err, "error building resolv.conf for container %s")
} }
return destPath, nil // Relabel resolv.conf for the container
if err := label.Relabel(destPath, c.config.MountLabel, false); err != nil {
return "", err
}
return filepath.Join(c.state.DestinationRunDir, "resolv.conf"), nil
} }
// generateHosts creates a containers hosts file // generateHosts creates a containers hosts file