1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Merge pull request #15148 from hqhq/hq_golint_native

Add back golint for daemon/execdriver/native
This commit is contained in:
Tibor Vass 2015-07-30 15:51:06 -04:00
commit 2d730c93b4
2 changed files with 3 additions and 2 deletions

View file

@ -58,11 +58,11 @@ func NewDriver(root, initPath string, options []string) (*Driver, error) {
if apparmor.IsEnabled() {
if err := installAppArmorProfile(); err != nil {
apparmor_profiles := []string{"docker-default", "docker-unconfined"}
apparmorProfiles := []string{"docker-default", "docker-unconfined"}
// Allow daemon to run if loading failed, but are active
// (possibly through another run, manually, or via system startup)
for _, policy := range apparmor_profiles {
for _, policy := range apparmorProfiles {
if err := hasAppArmorProfileLoaded(policy); err != nil {
return nil, fmt.Errorf("AppArmor enabled on system but the %s profile could not be loaded.", policy)
}

View file

@ -19,6 +19,7 @@ packages=(
daemon/execdriver
daemon/execdriver/execdrivers
daemon/execdriver/lxc
daemon/execdriver/native
daemon/execdriver/native/template
daemon/graphdriver/aufs
daemon/graphdriver/devmapper