mirrors/apparmor.d
1
0
Fork 0
mirror of https://github.com/roddhjav/apparmor.d.git synced 2025-01-31 07:17:22 +01:00
Code Issues 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
Failed to generate hash of commit
2 changed files with 10 additions and 3 deletions
Show stats 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 "arch", "opensuse":
case "ubuntu": case "ubuntu":
debianDisplaceClean()
if needDisplace { if needDisplace {
if _, err := paths.New("debian/apparmor.d.displace").Create(); err != nil {
return res, err
}
filesToDisplace := overwriteProfile(DistDir.Join("displace")) filesToDisplace := overwriteProfile(DistDir.Join("displace"))
if err := displaceFiles(filesToDisplace); err != nil { if err := displaceFiles(filesToDisplace); err != nil {
return res, err return res, err
@ -145,6 +143,8 @@ func Configure() ([]string, error) {
} }
} }
case "debian", "whonix": case "debian", "whonix":
debianDisplaceClean()
// Copy Debian specific abstractions // Copy Debian specific abstractions
if err := copyTo(DistDir.Join("ubuntu"), RootApparmord); err != nil { if err := copyTo(DistDir.Join("ubuntu"), RootApparmord); err != nil {
return res, err return res, err

7
pkg/prebuild/tools.go
View file

@ -110,6 +110,13 @@ func displaceFiles(files []string) error {
return nil return nil
} }
// Clean the debian/displace file
func debianDisplaceClean() {
if _, err := paths.New("debian/apparmor.d.displace").Create(); err != nil {
panic(err)
}
}
func overwriteProfile(path *paths.Path) []string { func overwriteProfile(path *paths.Path) []string {
res := []string{} res := []string{}
lines, err := path.ReadFileAsLines() lines, err := path.ReadFileAsLines()