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

fix(build): ensure the displace file get cleaned when not needed.

Browse source
This commit is contained in:
Alexandre Pujol 2024-02-29 00:03:39 +00:00
parent 1f3b812cfb
commit 45a6e0bf21
No known key found for this signature in database
GPG key ID: C5469996F0DF68EC
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pkg/prebuild/prepare.go
View file

@ -131,10 +131,8 @@ func Configure() ([]string, error) {
case "arch", "opensuse":
case "ubuntu":
debianDisplaceClean()
if needDisplace {
if _, err := paths.New("debian/apparmor.d.displace").Create(); err != nil {
return res, err
}
filesToDisplace := overwriteProfile(DistDir.Join("displace"))
if err := displaceFiles(filesToDisplace); err != nil {
return res, err
@ -145,6 +143,8 @@ func Configure() ([]string, error) {
}
}
case "debian", "whonix":
debianDisplaceClean()
// Copy Debian specific abstractions
if err := copyTo(DistDir.Join("ubuntu"), RootApparmord); err != nil {
return res, err