p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki 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)
Upstream-commit: ff662446f774d573442baa526263544df2570ebf
Component: engine
This commit is contained in:
Guillaume J. Charmes
2014-01-20 10:20:29 -08:00
parent f8a6d99b37
commit 642babd6eb
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/pkg/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
components/engine/pkg/sysinfo/sysinfo.go
View File

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