[apparmor] [patch] systemd support in rc.apparmor.functions (apparmor-securityfs-systemd.patch)

[Steve Beattie]

On Mon, Aug 08, 2011 at 11:55:50PM +0200, Christian Boltz wrote:
> this openSUSE patch is probably the shortest ;-) and adds systemd 
> support to rc.apparmor.functions

Acked-By: Steve Beattie <sbeattie at ubuntu.com> though an explanatory
comment would be useful as to explaining why testing for the existence
of the ${SECURITYFS} location in a systemd world might be useful. (I
think I know the reason, but would like verification.)

> ---
>  parser/rc.apparmor.functions |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> --- a/parser/rc.apparmor.functions
> +++ b/parser/rc.apparmor.functions
> @@ -295,7 +295,7 @@ is_apparmor_loaded() {
>  }
>  
>  is_securityfs_mounted() {
> -	grep -q securityfs /proc/filesystems && grep -q securityfs /proc/mounts
> +	test -d ${SECURITYFS} -a -d /sys/fs/cgroup/systemd || grep -q securityfs /proc/filesystems && grep -q securityfs /proc/mounts
>  	return $?
>  }
>  

-- 
Steve Beattie
<sbeattie at ubuntu.com>
http://NxNW.org/~steve/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20110809/1549ad2a/attachment.pgp>