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

Revert "fix: remove wip workarroind in gstreamer abs."

Browse source 
This reverts commit 75a8ef2906.
This commit is contained in:
Alexandre Pujol 2025-04-06 16:07:51 +02:00
parent 8b99a0bdff
commit ead2f4e40b
No known key found for this signature in database
GPG key ID: C5469996F0DF68EC
1 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
pkg/prebuild/prepare/fsp.go
View file

@ -9,6 +9,7 @@ import (
"github.com/roddhjav/apparmor.d/pkg/paths" "github.com/roddhjav/apparmor.d/pkg/paths"
"github.com/roddhjav/apparmor.d/pkg/prebuild" "github.com/roddhjav/apparmor.d/pkg/prebuild"
"github.com/roddhjav/apparmor.d/pkg/util"
) )
type FullSystemPolicy struct { type FullSystemPolicy struct {
@ -44,6 +45,18 @@ func (p FullSystemPolicy) Apply() ([]string, error) {
return res, err return res, err
} }
// Fix conflicting x modifiers in abstractions - FIXME: Temporary solution
path = prebuild.RootApparmord.Join("abstractions/gstreamer")
out, err = path.ReadFileAsString()
if err != nil {
return res, err
}
regFixConflictX := util.ToRegexRepl([]string{`.*gst-plugin-scanner.*`, ``})
out = regFixConflictX.Replace(out)
if err := path.WriteFile([]byte(out)); err != nil {
return res, err
}
// Set systemd unit drop-in files // Set systemd unit drop-in files
return res, paths.CopyTo(prebuild.SystemdDir.Join("full"), prebuild.Root.Join("systemd")) return res, paths.CopyTo(prebuild.SystemdDir.Join("full"), prebuild.Root.Join("systemd"))
} }