vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Add MAINTAINER and remove docker/utils dep from pkg/sysinfo

Browse source 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
This commit is contained in:
Guillaume J. Charmes 2014-01-20 10:20:29 -08:00
parent c23d7367a7
commit 5e662b11e9
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sysinfo/MAINTAINERS Normal file
View file

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

5
sysinfo/sysinfo.go
View file

@ -1,8 +1,7 @@
package sysinfo package sysinfo
import ( import (
"github.com/dotcloud/docker/cgroups" "github.com/dotcloud/docker/cgroups" // FIXME: move cgroups in pkg
"github.com/dotcloud/docker/utils"
"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