MAAS

Merge lp:~blake-rouse/maas/fix-1569568 into lp:~maas-maintainers/maas/packaging

  1. fix-1569568
  2. Merge into packaging
Proposed by Blake Rouse
Status: Merged
Approved by: Andres Rodriguez
Approved revision: no longer in the source branch.
Merged at revision: 482
Proposed branch: lp:~blake-rouse/maas/fix-1569568
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 12 lines (+1/-1)
1 file modified
debian/maas-dhcp.postrm (+1/-1)
To merge this branch: bzr merge lp:~blake-rouse/maas/fix-1569568
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+291685@code.launchpad.net

Commit message

Allow reloading of apparmor profile to fail on postrm.

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

lgtm!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/maas-dhcp.postrm'
2--- debian/maas-dhcp.postrm 2016-03-31 23:55:39 +0000
3+++ debian/maas-dhcp.postrm 2016-04-12 21:03:11 +0000
4@@ -6,7 +6,7 @@
5 dhcpd_prof="/etc/apparmor.d/usr.sbin.dhcpd"
6 if [ -f "${dhcpd_prof}" ] &&
7 command -v apparmor_parser >/dev/null 2>&1; then
8- apparmor_parser --replace --write-cache --skip-read-cache "${dhcpd_prof}"
9+ apparmor_parser --replace --write-cache --skip-read-cache "${dhcpd_prof}" || true
10 fi
11 if [ "$1" = "purge" ]; then
12 rm -rf /var/lib/maas/dhcp

Subscribers

People subscribed via source and target branches