mirror of
https://github.com/roddhjav/apparmor.d.git
synced 2025-01-18 00:48:10 +01:00
fix(build): ubuntu & debian share some build spec.
This commit is contained in:
parent
b53509664a
commit
9727d1ce1f
2 changed files with 8 additions and 10 deletions
|
@ -119,21 +119,19 @@ func Configure() error {
|
|||
return err
|
||||
}
|
||||
|
||||
case "ubuntu":
|
||||
aa.Tunables["libexec"] = []string{"/{usr/,}libexec"}
|
||||
if err := setLibexec(); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := paths.New("dists/ubuntu/trash").CopyTo(RootApparmord.Join("abstractions", "trash")); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
case "debian", "whonix":
|
||||
case "debian", "ubuntu", "whonix":
|
||||
aa.Tunables["libexec"] = []string{"/{usr/,}libexec"}
|
||||
if err := setLibexec(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if err := paths.New("dists/ubuntu/abstractions/trash").CopyTo(RootApparmord.Join("abstractions", "trash")); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if Distribution == "ubuntu" {
|
||||
break
|
||||
}
|
||||
for _, dirname := range []string{"abstractions", "tunables"} {
|
||||
files, err := filepath.Glob("dists/debian/" + dirname + "/*")
|
||||
if err != nil {
|
||||
|
|
Loading…
Reference in a new issue