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

Merge pull request #6180 from unclejack/apparmor

Browse source 
apparmor: write & load the profile on every start
This commit is contained in:
Victor Vieux 2014-06-03 15:56:28 -07:00
commit 29c3f75c27
1 changed files with 1 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
apparmor/setup.go
View file

@ -2,7 +2,6 @@ package apparmor
import (
"fmt"
"io"
"os"
"os/exec"
"path"
@ -12,42 +11,11 @@ const (
DefaultProfilePath = "/etc/apparmor.d/docker"
)
func InstallDefaultProfile(backupPath string) error {
func InstallDefaultProfile() error {
if !IsEnabled() {
return nil
}
// If the profile already exists, check if we already have a backup
// if not, do the backup and override it. (docker 0.10 upgrade changed the apparmor profile)
// see gh#5049, apparmor blocks signals in ubuntu 14.04
if _, err := os.Stat(DefaultProfilePath); err == nil {
if _, err := os.Stat(backupPath); err == nil {
// If both the profile and the backup are present, do nothing
return nil
}
// Make sure the directory exists
if err := os.MkdirAll(path.Dir(backupPath), 0755); err != nil {
return err
}
// Create the backup file
f, err := os.Create(backupPath)
if err != nil {
return err
}
defer f.Close()
src, err := os.Open(DefaultProfilePath)
if err != nil {
return err
}
defer src.Close()
if _, err := io.Copy(f, src); err != nil {
return err
}
}
// Make sure /etc/apparmor.d exists
if err := os.MkdirAll(path.Dir(DefaultProfilePath), 0755); err != nil {
return err