renamed /etc/apparmor.d/local/firejail-local to /etc/apparmor.d/local/firejail.default - merge form 0.9.62.4

3 files changed, 4 insertions, 2 deletions

diff --git a/Makefile.in b/Makefile.in
index 8cbba12e9..f1002f892 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -130,7 +130,7 @@ ifeq ($(HAVE_APPARMOR),-DHAVE_APPARMOR)
         install -m 0644 etc/apparmor/firejail-default $(DESTDIR)$(sysconfdir)/apparmor.d
         sh -c "if [ ! -d $(DESTDIR)/$(sysconfdir)/apparmor.d/local ]; then install -d -m 755 $(DESTDIR)/$(sysconfdir)/apparmor.d/local; fi;"
         # install apparmor profile customization file
-        sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/apparmor.d/local/firejail-local ]; then install -c -m 0644 etc/apparmor/firejail-local $(DESTDIR)/$(sysconfdir)/apparmor.d/local/.; fi;"
+        sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/apparmor.d/local/firejail-default ]; then install -c -m 0644 etc/apparmor/firejail-local $(DESTDIR)/$(sysconfdir)/apparmor.d/local/firejail-default; fi;"
 endif
         # man pages
         install -m 0755 -d $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5
diff --git a/README b/README
index cf6579265..04a3fda59 100644
--- a/README
+++ b/README
@@ -63,6 +63,8 @@ Firejail Authors (alphabetical order)
         - fix flameshot raw screenshots
 1dnrr (https://github.com/1dnrr)
         - add pybitmessage profile
+Ádler Jonas Gross (https://github.com/adgross)
+        - AppArmor fix
 Adrian L. Shaw (https://github.com/adrianlshaw)
         - add profanity profile
         - add barrirer profile
diff --git a/etc/apparmor/firejail-default b/etc/apparmor/firejail-default
index 04a38f0ce..68e20d9b9 100644
--- a/etc/apparmor/firejail-default
+++ b/etc/apparmor/firejail-default
@@ -157,5 +157,5 @@ capability setfcap,
 #capability mac_admin,
 
 # Site-specific additions and overrides. See local/README for details.
-#include <local/firejail-local>
+#include <local/firejail-default>
 }