docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Code simplification that @tiborvass requested 

Signed-off-by: Jimmy Puckett <jimmy.puckett@spinen.com>
This commit is contained in:
Jimmy Puckett 2015-03-24 21:10:07 -04:00
parent ec5e22efe3
commit e8e60befd6
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
daemon/daemon.go
View File

@ -445,8 +445,7 @@ func (daemon *Daemon) setupResolvconfWatcher() error {
select { select {
case event := <-watcher.Events: case event := <-watcher.Events:
if event.Name == "/etc/resolv.conf" && if event.Name == "/etc/resolv.conf" &&
(event.Op&fsnotify.Write != 0 || (event.Op & (fsnotify.Write | fsnotify.Create) != 0) {
event.Op&fsnotify.Create != 0) {
// verify a real change happened before we go further--a file write may have happened // verify a real change happened before we go further--a file write may have happened
// without an actual change to the file // without an actual change to the file
updatedResolvConf, newResolvConfHash, err := resolvconf.GetIfChanged() updatedResolvConf, newResolvConfHash, err := resolvconf.GetIfChanged()