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

Merge pull request #27051 from tophj-ibm/fix-installing-apparmor

Browse source 
Fix apparmor profile installation
This commit is contained in:
Justin Cormack 2016-09-30 17:38:20 +01:00 • committed by GitHub
commit 50856a2ce2
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/aaparser/aaparser.go
View file

@ -26,7 +26,7 @@ func GetVersion() (int, error) {
// LoadProfile runs `apparmor_parser -r` on a specified apparmor profile to
// replace the profile.
func LoadProfile(profilePath string) error {
_, err := cmd("-r", filepath.Dir(profilePath))
_, err := cmd("", "-r", filepath.Dir(profilePath))
if err != nil {
return err
}

4
profiles/apparmor/apparmor.go
View file

@ -66,8 +66,8 @@ func macroExists(m string) bool {
return err == nil
}
// InstallDefault generates a default profile and installs it in the
// ProfileDirectory with `apparmor_parser`.
// InstallDefault generates a default profile in a temp directory determined by
// os.TempDir(), then loads the profile into the kernel using 'apparmor_parser'.
func InstallDefault(name string) error {
p := profileData{
Name: name,