]> git.proxmox.com Git - lxc.git/commitdiff
use dh_apparmor for the lxc-containers profile
authorWolfgang Bumiller <w.bumiller@proxmox.com>
Fri, 29 Jul 2016 09:58:02 +0000 (11:58 +0200)
committerDietmar Maurer <dietmar@proxmox.com>
Fri, 5 Aug 2016 09:07:33 +0000 (11:07 +0200)
for consistency, this also ignores profile-reload errors
(again so that we can install it in a chroot without
unnecessary installation failures)

debian/lxc-pve.postinst
debian/rules

index 057c19f0afae35b4874cb1fb4edfbf41b91e58d1..b46e96d906dc6f2de9ca40e19ce3801c5e3e926f 100644 (file)
@@ -14,9 +14,6 @@ case "$1" in
        # create subuid/subgui map for root
        # (to run unprivileged containers as root)
        usermod -v 100000-165535 -w 100000-165535 root
-
-       # update apparmor profiles
-       apparmor_parser -r -W -T /etc/apparmor.d/lxc-containers
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
index 57d50d279962ae9d17387952c68af4bec0d7a34d..d6b5408c45016c248cd46adb0508304387dd7b7d 100755 (executable)
@@ -33,7 +33,7 @@ override_dh_strip:
 
 override_dh_install:
        dh_apparmor -p lxc-pve --profile-name=usr.bin.lxc-start
-
+       dh_apparmor -p lxc-pve --profile-name=lxc-containers
        dh_install --fail-missing
 
 override_dh_systemd_start: