Skip to content

Commit

Permalink
Add MAINTAINER and remove docker/utils dep from pkg/sysinfo
Browse files Browse the repository at this point in the history
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <[email protected]> (github: creack)
  • Loading branch information
creack committed Jan 20, 2014
1 parent cfd3d02 commit ff66244
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 2 additions & 0 deletions pkg/sysinfo/MAINTAINERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Michael Crosby <[email protected]> (@crosbymichael)
Guillaume J. Charmes <[email protected]> (@creack)
5 changes: 1 addition & 4 deletions pkg/sysinfo/sysinfo.go
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit ff66244

Please sign in to comment.