clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-03 23:38:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

add resolvconf

Browse Source 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
This commit is contained in:
Victor Vieux
2014-05-05 22:55:32 +00:00
parent a1a029f6d7
commit 3744452ecf
7 changed files with 237 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files
daemon/daemon.go
+2 -1
View File
@@ -29,6 +29,7 @@ import (
"github.com/dotcloud/docker/pkg/graphdb"
"github.com/dotcloud/docker/pkg/label"
"github.com/dotcloud/docker/pkg/mount"
"github.com/dotcloud/docker/pkg/networkfs/resolvconf"
"github.com/dotcloud/docker/pkg/selinux"
"github.com/dotcloud/docker/pkg/sysinfo"
"github.com/dotcloud/docker/runconfig"
@@ -981,7 +982,7 @@ func (daemon *Daemon) SetServer(server Server) {
}
func (daemon *Daemon) checkLocaldns() error {
resolvConf, err := utils.GetResolvConf()
resolvConf, err := resolvconf.Get()
if err != nil {
return err
}