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

libpod/container.go Handle systemd resolve

Browse Source 
In cases, like Ubuntu, where it uses systemd resolve
for DNS then do not copy /etc/resolv.conf but instead
the resolv.conf in the systemd resolve /run dir.

Signed-off-by: baude <bbaude@redhat.com>

Closes: #177
Approved by: rhatdan
This commit is contained in:
baude
2018-01-02 13:53:08 -06:00
committed by Atomic Bot
parent de6d5b75ac
commit 8aeb38e4a7
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libpod/container.go
View File

@ -584,9 +584,17 @@ func (c *Container) Init() (err error) {
}
// Copy /etc/resolv.conf to the container's rundir
runDirResolv, err := c.copyHostFileToRundir("/etc/resolv.conf")
resolvPath := "/etc/resolv.conf"
// Check if the host system is using system resolve and if so
// copy its resolv.conf
_, err = os.Stat("/run/systemd/resolve/resolv.conf")
if err == nil {
resolvPath = "/run/systemd/resolve/resolv.conf"
}
runDirResolv, err := c.copyHostFileToRundir(resolvPath)
if err != nil {
return errors.Wrapf(err, "unable to copy /etc/resolv.conf to ", runDirResolv)
return errors.Wrapf(err, "unable to copy resolv.conf to ", runDirResolv)
}
// Copy /etc/hosts to the container's rundir
runDirHosts, err := c.copyHostFileToRundir("/etc/hosts")