From 81d514d89aa81bc525df2261ac0c0e7729390f87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= Date: Tue, 23 Apr 2019 08:36:46 +0300 Subject: [PATCH] aa-notify: Always use aa.CONFDIR, don't assume "/etc/apparmor" Also fix cosmetic comment. --- utils/aa-notify | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/utils/aa-notify b/utils/aa-notify index 89b0c9290..700935206 100755 --- a/utils/aa-notify +++ b/utils/aa-notify @@ -26,7 +26,7 @@ # # In a typical desktop environment one would run as a service the # command: -# /usr/bin/python3 /usr/bin/aa-notify -p -w 10 +# /usr/bin/aa-notify -p -w 10 import argparse import atexit @@ -435,7 +435,8 @@ def main(): shell_config = aaconfig.Config('shell') # Load system's notify.conf - system_config = read_notify_conf('/etc/apparmor', shell_config) + # By default aa.CONFDIR is /etc/apparmor on most production systems + system_config = read_notify_conf(aa.CONFDIR, shell_config) # Set default is no system notify.conf was found if not system_config: system_config = {'': {'show_notifications': 'yes'}}