p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5498 from tianon/better-apparmor-missing-error

Browse Source 
Upstream-commit: bfedf247a46acc6deceeaef5703b76026691d42b
Component: engine
This commit is contained in:
Michael Crosby
2014-04-30 15:16:43 -07:00
parent 87fcb82bfa 2256dd9cdf
commit 2bc0a4b67c
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
components/engine/pkg/apparmor/setup.go
View File

@ -69,15 +69,8 @@ func InstallDefaultProfile(backupPath string) error {
cmd.Dir = "/etc/apparmor.d"
output, err := cmd.CombinedOutput()
if err != nil && !os.IsNotExist(err) {
if e, ok := err.(*exec.Error); ok {
// keeping with the current profile load code, if the parser does not
// exist then just return
if e.Err == exec.ErrNotFound || os.IsNotExist(e.Err) {
return nil
}
}
return fmt.Errorf("Error loading docker profile: %s (%s)", err, output)
if err != nil {
return fmt.Errorf("Error loading docker apparmor profile: %s (%s)", err, output)
}
return nil
}