From e9d8e38c4758fdc0ebca5b54cdc1ba253cbbd438 Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Tue, 18 Aug 2015 10:01:52 -0400 Subject: [PATCH] Quiet sysinfo warnings on container create/start This was making logrus warn on each container create and start. These warnings are not needed as the code below already warns when these various cgroup settings aren't supported but have been set. Warnings were originally introduced by #15381, which appear to be a side-effect of that change and not the intention. Signed-off-by: Brian Goff --- daemon/daemon_unix.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go index 82f993aab6..2d01b92cc0 100644 --- a/daemon/daemon_unix.go +++ b/daemon/daemon_unix.go @@ -110,7 +110,7 @@ func (daemon *Daemon) adaptContainerSettings(hostConfig *runconfig.HostConfig, a // hostconfig and config structures. func verifyPlatformContainerSettings(daemon *Daemon, hostConfig *runconfig.HostConfig, config *runconfig.Config) ([]string, error) { warnings := []string{} - sysInfo := sysinfo.New(false) + sysInfo := sysinfo.New(true) if hostConfig.LxcConf.Len() > 0 && !strings.Contains(daemon.ExecutionDriver().Name(), "lxc") { return warnings, fmt.Errorf("Cannot use --lxc-conf with execdriver: %s", daemon.ExecutionDriver().Name())