doc: s/aa_allow_incomplete/apparmor.allow_incomplete/g

Signed-off-by: Long Wang <w@laoqinren.net>

diff --git a/doc/ja/lxc.container.conf.sgml.in b/doc/ja/lxc.container.conf.sgml.in
index 370856bba1b23e7c9a12138d9afe683ba0cc226f..364ecd9abe9dc6c18d0178ae01ee8e34951aa2b7 100644 (file)
--- a/doc/ja/lxc.container.conf.sgml.in
+++ b/doc/ja/lxc.container.conf.sgml.in
@@ -1715,7 +1715,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
         </varlistentry>
         <varlistentry>
           <term>
-            <option>lxc.aa_allow_incomplete</option>
+            <option>lxc.apparmor.allow_incomplete</option>
           </term>
           <listitem>
             <para>

diff --git a/doc/ko/lxc.container.conf.sgml.in b/doc/ko/lxc.container.conf.sgml.in
index d6deb6ccb0dc74fd1a6eef58c1b3c83bdaa8d9b2..1454addfa3f7eca5be02683019ac1e4e9bb3e660 100644 (file)
--- a/doc/ko/lxc.container.conf.sgml.in
+++ b/doc/ko/lxc.container.conf.sgml.in
@@ -1655,7 +1655,7 @@ proc proc proc nodev,noexec,nosuid 0 0
        </varlistentry>
        <varlistentry>
          <term>
-           <option>lxc.aa_allow_incomplete</option>
+           <option>lxc.apparmor.allow_incomplete</option>
          </term>
          <listitem>
            <para>

diff --git a/doc/lxc.container.conf.sgml.in b/doc/lxc.container.conf.sgml.in
index 390f6c05ccf6972236ab4065371181f87c5d1a55..b59d3181f265fd15d10772d4f2f44db59aa5d6f9 100644 (file)
--- a/doc/lxc.container.conf.sgml.in
+++ b/doc/lxc.container.conf.sgml.in
@@ -1242,7 +1242,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
         </varlistentry>
         <varlistentry>
           <term>
-            <option>lxc.aa_allow_incomplete</option>
+            <option>lxc.apparmor.allow_incomplete</option>
           </term>
           <listitem>
             <para>

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index 73532eccc04e35dbf871640579afada6daa90082..55917e8c45514762b931b27e4bab0192d6417d6c 100644 (file)
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -1370,7 +1370,7 @@ static int set_config_apparmor_allow_incomplete(const char *key,
                return -1;
 
        if (lxc_conf->lsm_aa_allow_incomplete > 1) {
-               ERROR("Wrong value for lxc.lsm_aa_allow_incomplete. Can only "
+               ERROR("Wrong value for lxc.apparmor.allow_incomplete. Can only "
                      "be set to 0 or 1");
                return -1;
        }

diff --git a/src/lxc/lsm/apparmor.c b/src/lxc/lsm/apparmor.c
index c0b2e340d281dd2eafa0ec75ec1291fbe202de8d..8098fde9e9ac665a8f601077cb1a4103c12b18a0 100644 (file)
--- a/src/lxc/lsm/apparmor.c
+++ b/src/lxc/lsm/apparmor.c
@@ -218,7 +218,7 @@ static int apparmor_process_label_set(const char *inlabel, struct lxc_conf *conf
                WARN("Incomplete AppArmor support in your kernel");
                if (!conf->lsm_aa_allow_incomplete) {
                        ERROR("If you really want to start this container, set");
-                       ERROR("lxc.aa_allow_incomplete = 1");
+                       ERROR("lxc.apparmor.allow_incomplete = 1");
                        ERROR("in your container configuration file");
                        return -1;
                }

diff --git a/src/tests/lxc-test-apparmor-mount b/src/tests/lxc-test-apparmor-mount
index 891cd7a7c9ebb50393a39ee7d35a6679ee97d26f..0523a80aef18486267f46eefb995f51731486f50 100755 (executable)
--- a/src/tests/lxc-test-apparmor-mount
+++ b/src/tests/lxc-test-apparmor-mount
@@ -213,7 +213,7 @@ run_cmd lxc-stop -n $cname -k
 
 echo "testing override"
 sed -i '/aa_profile/d' $HDIR/.local/share/lxc/$cname/config
-echo "lxc.aa_allow_incomplete = 1" >> $HDIR/.local/share/lxc/$cname/config
+echo "lxc.apparmor.allow_incomplete = 1" >> $HDIR/.local/share/lxc/$cname/config
 run_cmd lxc-start -n $cname -d
 run_cmd lxc-wait -n $cname -s RUNNING
 pid=`run_cmd lxc-info -p -H -n $cname`