mirror of
https://gitlab.com/apparmor/apparmor
synced 2025-08-22 01:57:43 +00:00
Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
Description: fix compile on build Patch from Gentoo community: - fix up a couple of missing semicolons in syntax (bison compensates by emitting it's own) - Fix yet another variable tyop in rc.apparmor.functions - dump stderr of ls in rc.apparmor.functions to /dev/null - add an install-unknown make target
This commit is contained in:
parent
aed481debe
commit
6cfcb1a823
@ -252,6 +252,9 @@ install-slackware:
|
||||
.PHONY: install-debian
|
||||
install-debian:
|
||||
|
||||
.PHONY: install-unknown
|
||||
install-unknown:
|
||||
|
||||
INSTALLDEPS=$(TOOLS)
|
||||
ifdef DISTRO
|
||||
INSTALLDEPS+=install-$(DISTRO)
|
||||
|
@ -544,7 +544,7 @@ rules: rules opt_audit_flag TOK_DENY network_rule
|
||||
free(entry);
|
||||
}
|
||||
|
||||
$$ = $1
|
||||
$$ = $1;
|
||||
}
|
||||
|
||||
rules: rules opt_audit_flag network_rule
|
||||
@ -582,7 +582,7 @@ rules: rules opt_audit_flag network_rule
|
||||
free(entry);
|
||||
}
|
||||
|
||||
$$ = $1
|
||||
$$ = $1;
|
||||
}
|
||||
|
||||
rules: rules change_profile
|
||||
|
@ -68,7 +68,7 @@ else
|
||||
fi
|
||||
|
||||
# SUBDOMAIN_DIR and APPARMOR_DIR might be defined in subdomain.conf|apparmor.conf
|
||||
if [ -d "${APPAMROR_DIR}" ] ; then
|
||||
if [ -d "${APPARMOR_DIR}" ] ; then
|
||||
PROFILE_DIR=${APPARMOR_DIR}
|
||||
elif [ -d "${SUBDOMAIN_DIR}" ] ; then
|
||||
PROFILE_DIR=${SUBDOMAIN_DIR}
|
||||
@ -115,7 +115,7 @@ is_apparmor_present() {
|
||||
grep -qE "^($modules)[[:space:]]" /proc/modules
|
||||
|
||||
if [ $? -ne 0 ] ; then
|
||||
ls /sys/module/apparmor | grep -qE "^($modules)"
|
||||
ls /sys/module/apparmor 2>/dev/null | grep -qE "^($modules)"
|
||||
fi
|
||||
|
||||
return $?
|
||||
|
Loading…
x
Reference in New Issue
Block a user