X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/blobdiff_plain/0521e1a0b23deee988750806ef1df620924dc043..1be55b971dadcf952aeed25d7c84efc2b71d4c85:/Makefile diff --git a/Makefile b/Makefile index b128ef5..c70814d 100644 --- a/Makefile +++ b/Makefile @@ -39,10 +39,8 @@ install_apparmor: cp -f data/configs/apparmor_profiles/adbd $(INSTALL_APPARMOR_DIR)/adbd cp -f data/configs/apparmor_profiles/android_app $(INSTALL_APPARMOR_DIR)/android_app cp -f data/configs/apparmor_profiles/lxc-waydroid $(INSTALL_APPARMOR_DIR)/lxc/lxc-waydroid - 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"; \