Browse Source

Merge pull request #3678 from creack/sysinfo_update

Add MAINTAINER and remove docker/utils dep from pkg/sysinfo
Guillaume J. Charmes 11 years ago
parent
commit
a431f1703d
2 changed files with 3 additions and 4 deletions
  1. 2 0
      pkg/sysinfo/MAINTAINERS
  2. 1 4
      pkg/sysinfo/sysinfo.go

+ 2 - 0
pkg/sysinfo/MAINTAINERS

@@ -0,0 +1,2 @@
+Michael Crosby <michael@crosbymichael.com> (@crosbymichael)
+Guillaume J. Charmes <guillaume.charmes@docker.com> (@creack)

+ 1 - 4
pkg/sysinfo/sysinfo.go

@@ -1,8 +1,7 @@
 package sysinfo
 package sysinfo
 
 
 import (
 import (
-	"github.com/dotcloud/docker/cgroups"
-	"github.com/dotcloud/docker/utils"
+	"github.com/dotcloud/docker/cgroups" // FIXME: move cgroups in pkg
 	"io/ioutil"
 	"io/ioutil"
 	"log"
 	"log"
 	"os"
 	"os"
@@ -45,10 +44,8 @@ func New(quiet bool) *SysInfo {
 
 
 	// Check if AppArmor seems to be enabled on this system.
 	// Check if AppArmor seems to be enabled on this system.
 	if _, err := os.Stat("/sys/kernel/security/apparmor"); os.IsNotExist(err) {
 	if _, err := os.Stat("/sys/kernel/security/apparmor"); os.IsNotExist(err) {
-		utils.Debugf("/sys/kernel/security/apparmor not found; assuming AppArmor is not enabled.")
 		sysInfo.AppArmor = false
 		sysInfo.AppArmor = false
 	} else {
 	} else {
-		utils.Debugf("/sys/kernel/security/apparmor found; assuming AppArmor is enabled.")
 		sysInfo.AppArmor = true
 		sysInfo.AppArmor = true
 	}
 	}
 	return sysInfo
 	return sysInfo