felipe/apparmor.d
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(build): ubuntu & debian share some build spec.

Browse source
This commit is contained in:
Alexandre Pujol 2023-04-24 00:17:00 +01:00
parent b53509664a
commit 9727d1ce1f
No known key found for this signature in database
GPG key ID: C5469996F0DF68EC
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
cmd/prebuild/prepare.go
View file

@ -119,21 +119,19 @@ func Configure() error {
return err return err
} }
case "ubuntu": case "debian", "ubuntu", "whonix":
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":
aa.Tunables["libexec"] = []string{"/{usr/,}libexec"} aa.Tunables["libexec"] = []string{"/{usr/,}libexec"}
if err := setLibexec(); err != nil { if err := setLibexec(); err != nil {
return err 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"} { for _, dirname := range []string{"abstractions", "tunables"} {
files, err := filepath.Glob("dists/debian/" + dirname + "/*") files, err := filepath.Glob("dists/debian/" + dirname + "/*")
if err != nil { if err != nil {

0
dists/ubuntu/trash → dists/ubuntu/abstractions/trash
View file