From: Alessandro Astone Date: Mon, 14 Nov 2022 21:35:42 +0000 (+0100) Subject: Also support SUSE apparmor X-Git-Tag: 1.3.4~13 X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/commitdiff_plain/5f2c391bf1649cb3708ee0c11f678a464de2fb6f?ds=inline Also support SUSE apparmor --- diff --git a/Makefile b/Makefile index b128ef5..a3ec1c8 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,7 @@ install_apparmor: sed --sandbox -i "/lxc.aa_profile/ s/unconfined/lxc-waydroid/g" $(DESTDIR)$(WAYDROID_DIR)/data/configs/config_1 sed --sandbox -i "/lxc.apparmor.profile/ s/unconfined/lxc-waydroid/g" $(DESTDIR)$(WAYDROID_DIR)/data/configs/config_2 # Load the profiles if not just packaging - if [ -z $(DESTDIR) ] && aa-enabled --quiet 2>/dev/null; then \ + if [ -z $(DESTDIR) ] && { aa-enabled --quiet || systemctl is-active -q apparmor; } 2>/dev/null; then \ apparmor_parser -r -T -W "$(INSTALL_APPARMOR_DIR)/adbd"; \ apparmor_parser -r -T -W "$(INSTALL_APPARMOR_DIR)/android_app"; \ apparmor_parser -r -T -W "$(INSTALL_APPARMOR_DIR)/lxc/lxc-waydroid"; \