← Back to branch summary

~ubuntu-branches/ubuntu/precise/apparmor/precise-security

« back to all changes in this revision

Viewing changes to debian/apparmor.init

  • Committer: Package Import Robot
  • Author(s): Steve Beattie, Jamie Strandboge, Serge Hallyn, Steve Beattie
  • Date: 2012-04-12 06:17:42 UTC
  • Revision ID: package-import@ubuntu.com-20120412061742-9v75hjko2mjtbewv
Tags: 2.7.102-0ubuntu3
https://launchpad.net/bugs/974089
https://launchpad.net/bugs/978297
https://launchpad.net/bugs/963756
https://launchpad.net/bugs/959560
https://launchpad.net/bugs/872446
https://launchpad.net/bugs/978584
https://launchpad.net/bugs/800826
https://launchpad.net/bugs/979095
https://launchpad.net/bugs/963756
https://launchpad.net/bugs/978038
https://launchpad.net/bugs/968956
https://launchpad.net/bugs/979135
[ Jamie Strandboge ]
* debian/patches/0007-ubuntu-manpage-updates.patch: update apparmor(5)
  to describe Ubuntu's two-stage policy load and how to add utilize it
  when developing policy (LP: #974089)

[ Serge Hallyn ]
* debian/apparmor.init: do nothing in a container.  This can be
  removed once stacked profiles are supported and used by lxc.
  (LP: #978297)

[ Steve Beattie ]
* debian/patches/0008-apparmor-lp963756.patch: Fix permission mapping
  for change_profile onexec (LP: #963756)
* debian/patches/0009-apparmor-lp959560-part1.patch,
  debian/patches/0010-apparmor-lp959560-part2.patch: Update the parser
  to support the 'in' keyword for value lists, and make mount
  operations aware of 'in' keyword so they can affect the flags build
  list (LP: #959560)
* debian/patches/0011-apparmor-lp872446.patch: fix logprof missing
  exec events in complain mode (LP: #872446)
* debian/patches/0012-apparmor-lp978584.patch: allow inet6 access in
  dovecot imap-login profile (LP: #978584)
* debian/patches/0013-apparmor-lp800826.patch: fix libapparmor
  log parsing library from dropping apparmor network events that
  contain ip addresses or ports in them (LP: #800826)
* debian/patches/0014-apparmor-lp979095.patch: document new mount rule
  syntax and usage in apparmor.d(5) manpage (LP: #979095)
* debian/patches/0015-apparmor-lp963756.patch: Fix change_onexec
  for profiles without attachment specification (LP: #963756,
  LP: #978038)
* debian/patches/0016-apparmor-lp968956.patch: Fix protocol error when
  loading policy to kernels without compat patches (LP: #968956)
* debian/patches/0017-apparmor-lp979135.patch: Fix change_profile to
  grant access to /proc/attr api (LP: #979135)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/apparmor.init
81
81
rc=255
82
82
case "$1" in
83
83
        start)
 
84
                if [ -x /bin/running-in-container ] && /bin/running-in-container; then
 
85
                        log_daemon_msg "Not starting AppArmor in container"
 
86
                        log_end_msg 0
 
87
                        exit 0
 
88
                fi
84
89
                log_daemon_msg "Starting AppArmor profiles"
85
90
                securityfs
86
91
                load_configured_profiles
103
108
EOM
104
109
                ;;
105
110
        teardown)
 
111
                if [ -x /bin/running-in-container ] && /bin/running-in-container; then
 
112
                        log_daemon_msg "Not tearing down AppArmor in container"
 
113
                        log_end_msg 0
 
114
                        exit 0
 
115
                fi
106
116
                log_daemon_msg "Unloading AppArmor profiles"
107
117
                securityfs
108
118
                running_profile_names | while read profile; do
115
125
                log_end_msg $rc
116
126
                ;;
117
127
        restart|reload|force-reload)
 
128
                if [ -x /bin/running-in-container ] && /bin/running-in-container; then
 
129
                        log_daemon_msg "Not reloading AppArmor in container"
 
130
                        log_end_msg 0
 
131
                        exit 0
 
132
                fi
118
133
                log_daemon_msg "Reloading AppArmor profiles"
119
134
                securityfs
120
135
                clear_cache