From 9956bdeefc206fd18a1705a55f38bf313a112b15 Mon Sep 17 00:00:00 2001 From: Edison Su Date: Fri, 27 May 2011 11:27:15 -0400 Subject: [PATCH] disable apparmor profile is better than disable the whole service --- python/lib/cloudutils/serviceConfig.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/python/lib/cloudutils/serviceConfig.py b/python/lib/cloudutils/serviceConfig.py index a94ed6722bc..1c00e6cf676 100644 --- a/python/lib/cloudutils/serviceConfig.py +++ b/python/lib/cloudutils/serviceConfig.py @@ -322,13 +322,19 @@ class securityPolicyConfigUbuntu(serviceCfgBase): def config(self): try: - if bash("service apparmor status").getStdout() == "": + cmd = bash("service apparmor status") + if not cmd.isSuccess() or cmd.getStdout() == "": self.spRunning = False return True - bash("service apparmor stop") - - bash("update-rc.d -f apparmor remove") + if not bash("apparmor_status |grep libvirt").isSuccess(): + return True + + bash("ln -s /etc/apparmor.d/usr.sbin.libvirtd /etc/apparmor.d/disable/") + bash("ln -s /etc/apparmor.d/usr.lib.libvirt.virt-aa-helper /etc/apparmor.d/disable/") + bash("apparmor_parser -R /etc/apparmor.d/usr.sbin.libvirtd") + bash("apparmor_parser -R /etc/apparmor.d/usr.lib.libvirt.virt-aa-helper") + return True except: raise CloudRuntimeException("Failed to configure apparmor, please see the /var/log/cloud/setupAgent.log for detail, \