fix: remove wip workarroind in gstreamer abs.
This commit is contained in:
parent
9e9036b86d
commit
75a8ef2906
1 changed files with 0 additions and 13 deletions
|
|
@ -9,7 +9,6 @@ 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 {
|
||||||
|
|
@ -45,18 +44,6 @@ 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, prebuild.SystemdDir.Join("full").CopyFS(prebuild.Root.Join("systemd"))
|
return res, prebuild.SystemdDir.Join("full").CopyFS(prebuild.Root.Join("systemd"))
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue