mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-04 16:35:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'feature/aa-notify-new-features' into 'master'

Browse source 
Minor improvements to aa-notify

See merge request apparmor/apparmor!372

Acked-by: Christian Boltz <apparmor@cboltz.de>
This commit is contained in:
Christian Boltz 2019-05-03 18:15:02 +00:00
commit f0db04d2b7
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
utils/aa-notify
View file

@ -26,7 +26,7 @@
# #
# In a typical desktop environment one would run as a service the # In a typical desktop environment one would run as a service the
# command: # command:
# /usr/bin/python3 /usr/bin/aa-notify -p -w 10 # /usr/bin/aa-notify -p -w 10
import argparse import argparse
import atexit import atexit
@ -435,7 +435,8 @@ def main():
shell_config = aaconfig.Config('shell') shell_config = aaconfig.Config('shell')
# Load system's notify.conf # 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 # Set default is no system notify.conf was found
if not system_config: if not system_config:
system_config = {'': {'show_notifications': 'yes'}} system_config = {'': {'show_notifications': 'yes'}}