mirrors/apparmor.d
1
0
Fork 0
mirror of https://github.com/roddhjav/apparmor.d.git synced 2025-01-18 00:48:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: better way to handle libexec.

Browse source
This commit is contained in:
Alexandre Pujol 2023-04-25 23:24:10 +01:00
parent c53049293b
commit fdc5839dd9
Failed to generate hash of commit
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cmd/prebuild/prepare.go
View file

@ -108,20 +108,17 @@ func Merge() error {
func Configure() error { func Configure() error {
switch Distribution { switch Distribution {
case "arch": case "arch":
aa.Tunables["libexec"] = []string{"/{usr/,}lib"} if err := setLibexec("/{usr/,}lib"); err != nil {
if err := setLibexec(); err != nil {
return err return err
} }
case "opensuse": case "opensuse":
aa.Tunables["libexec"] = []string{"/{usr/,}libexec"} if err := setLibexec("/{usr/,}libexec"); err != nil {
if err := setLibexec(); err != nil {
return err return err
} }
case "debian", "ubuntu", "whonix": case "debian", "ubuntu", "whonix":
aa.Tunables["libexec"] = []string{"/{usr/,}libexec"} if err := setLibexec("/{usr/,}libexec"); err != nil {
if err := setLibexec(); err != nil {
return err return err
} }
@ -162,16 +159,19 @@ func Configure() error {
return nil return nil
} }
func setLibexec() error { func setLibexec(libexec string) error {
aa.Tunables["libexec"] = []string{libexec}
file, err := RootApparmord.Join("tunables", "multiarch.d", "apparmor.d").Append() file, err := RootApparmord.Join("tunables", "multiarch.d", "apparmor.d").Append()
if err != nil { if err != nil {
return err return err
} }
defer file.Close() defer file.Close()
_, err = file.WriteString(`@{libexec}=` + aa.Tunables["libexec"][0]) _, err = file.WriteString(`@{libexec}=` + libexec)
return err return err
} }
}
// Set flags on some profiles according to manifest defined in `dists/flags/` // Set flags on some profiles according to manifest defined in `dists/flags/`
func SetFlags() error { func SetFlags() error {
for _, name := range []string{"main.flags", Distribution + ".flags"} { for _, name := range []string{"main.flags", Distribution + ".flags"} {