Merge lp:~smoser/maas/packaging.aa-update into lp:~maas-maintainers/maas/packaging

[Scott Moser]

On install and removal of maas-dhcp invoke apparmor update

On install and removal of maas-dhcp invoke apparmor update

[Andres Rodriguez (andreserl)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-13 03:13:19 +0000
+++ debian/changelog	2012-09-14 17:00:25 +0000
@@ -1,8 +1,9 @@
 maas (0.1+bzr987+dfsg-0ubuntu3) UNRELEASED; urgency=low
 
   [ Scott Moser ]
-  * debian/maas-dhcp.{install,apparmor} install apparmor profile into
-    /etc/apparmor.d/dhcpd.d (LP: #1049177)
+  * debian/maas-dhcp.{install,apparmor,postrm} install apparmor profile into
+    /etc/apparmor.d/dhcpd.d (LP: #1049177), and update apparmor profile for
+    /usr/sbin/dhcpd on install/remove
 
   [ Andres Rodriguez ]
   * debian/maas.postinst: Always restart apache2.

=== modified file 'debian/maas-dhcp.postinst'
--- debian/maas-dhcp.postinst	2012-09-14 01:27:09 +0000
+++ debian/maas-dhcp.postinst	2012-09-14 17:00:25 +0000
@@ -35,5 +35,13 @@
 
 fi
 
+if [ "$1" = "configure" ]; then
+   dhcpd_prof="/etc/apparmor.d/usr.sbin.dhcpd"
+   if [ -f "${dhcpd_prof}" ] &&
+      command -v apparmor_parser >/dev/null 2>&1; then
+      apparmor_parser --replace --write-cache --skip-read-cache "${dhcpd_prof}"
+   fi
+fi
+
 #DEBHELPER#
 exit 0

=== added file 'debian/maas-dhcp.postrm'
--- debian/maas-dhcp.postrm	1970-01-01 00:00:00 +0000
+++ debian/maas-dhcp.postrm	2012-09-14 17:00:25 +0000
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+
+if [ "$1" = "remove" -o "$1" = "purge" ]; then
+   dhcpd_prof="/etc/apparmor.d/usr.sbin.dhcpd"
+   if [ -f "${dhcpd_prof}" ] &&
+      command -v apparmor_parser >/dev/null 2>&1; then
+      apparmor_parser --replace --write-cache --skip-read-cache "${dhcpd_prof}"
+   fi
+fi