jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #498 from athoune/typo 

Fix: typos.
This commit is contained in:
Mrunal Patel 2015-04-02 13:50:04 -07:00
parent b89112c542 ee1000e153
commit c22ac4876f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apparmor/gen.go
View File

@ -67,12 +67,12 @@ func generateProfile(out io.Writer) error {
data := &data{ data := &data{
Name: "docker-default", Name: "docker-default",
} }
if tuntablesExists() { if tunablesExists() {
data.Imports = append(data.Imports, "#include <tunables/global>") data.Imports = append(data.Imports, "#include <tunables/global>")
} else { } else {
data.Imports = append(data.Imports, "@{PROC}=/proc/") data.Imports = append(data.Imports, "@{PROC}=/proc/")
} }
if abstrctionsEsists() { if abstractionsExists() {
data.InnerImports = append(data.InnerImports, "#include <abstractions/base>") data.InnerImports = append(data.InnerImports, "#include <abstractions/base>")
} }
if err := compiled.Execute(out, data); err != nil { if err := compiled.Execute(out, data); err != nil {
@ -82,13 +82,13 @@ func generateProfile(out io.Writer) error {
} }
// check if the tunables/global exist // check if the tunables/global exist
func tuntablesExists() bool { func tunablesExists() bool {
_, err := os.Stat("/etc/apparmor.d/tunables/global") _, err := os.Stat("/etc/apparmor.d/tunables/global")
return err == nil return err == nil
} }
// check if abstractions/base exist // check if abstractions/base exist
func abstrctionsEsists() bool { func abstractionsExists() bool {
_, err := os.Stat("/etc/apparmor.d/abstractions/base") _, err := os.Stat("/etc/apparmor.d/abstractions/base")
return err == nil return err == nil
} }