mirror of
https://github.com/roddhjav/apparmor.d.git
synced 2024-12-26 15:06:45 +01:00
build: allow to run prebuild outside of this project.
This commit is contained in:
parent
e17b682e51
commit
68127c3859
3 changed files with 4 additions and 4 deletions
|
@ -31,7 +31,7 @@ func init() {
|
||||||
|
|
||||||
// Build tasks applied by default
|
// Build tasks applied by default
|
||||||
builder.Register(
|
builder.Register(
|
||||||
"userspace", // Resolve variable in the userspace profile
|
"userspace", // Resolve variable in profile attachments
|
||||||
"hotfix", // Temporary fix for #74, #80 & #235
|
"hotfix", // Temporary fix for #74, #80 & #235
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -27,7 +27,7 @@ func init() {
|
||||||
RegisterBuilder(&Userspace{
|
RegisterBuilder(&Userspace{
|
||||||
Base: prebuild.Base{
|
Base: prebuild.Base{
|
||||||
Keyword: "userspace",
|
Keyword: "userspace",
|
||||||
Msg: "Bypass userspace tools restriction",
|
Msg: "Resolve variable in profile attachments",
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
|
@ -73,10 +73,10 @@ func Prebuild() {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if full {
|
if full && paths.New("apparmor.d/groups/_full").Exist() {
|
||||||
prepare.Register("fsp")
|
prepare.Register("fsp")
|
||||||
builder.Register("fsp")
|
builder.Register("fsp")
|
||||||
} else {
|
} else if prebuild.SystemdDir.Exist() {
|
||||||
prepare.Register("systemd-early")
|
prepare.Register("systemd-early")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue