Skip to content

L
lxc
Commit 69e38e00 by Long Wang
Options

doc: s/aa_allow_incomplete/apparmor.allow_incomplete/g

Signed-off-by: 's avatarLong Wang <w@laoqinren.net>
parent 93e2c336
Showing with 6 additions and 6 deletions
doc/ja/lxc.container.conf.sgml.in
...@@ -1715,7 +1715,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp> ...@@ -1715,7 +1715,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term> <term>
<option>lxc.aa_allow_incomplete</option> <option>lxc.apparmor.allow_incomplete</option>
</term> </term>
<listitem> <listitem>
<para> <para>
......
doc/ko/lxc.container.conf.sgml.in
...@@ -1655,7 +1655,7 @@ proc proc proc nodev,noexec,nosuid 0 0 ...@@ -1655,7 +1655,7 @@ proc proc proc nodev,noexec,nosuid 0 0
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term> <term>
<option>lxc.aa_allow_incomplete</option> <option>lxc.apparmor.allow_incomplete</option>
</term> </term>
<listitem> <listitem>
<para> <para>
......
doc/lxc.container.conf.sgml.in
...@@ -1242,7 +1242,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ...@@ -1242,7 +1242,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term> <term>
<option>lxc.aa_allow_incomplete</option> <option>lxc.apparmor.allow_incomplete</option>
</term> </term>
<listitem> <listitem>
<para> <para>
......
src/lxc/confile.c
...@@ -1370,7 +1370,7 @@ static int set_config_apparmor_allow_incomplete(const char *key, ...@@ -1370,7 +1370,7 @@ static int set_config_apparmor_allow_incomplete(const char *key,
return -1; return -1;
if (lxc_conf->lsm_aa_allow_incomplete > 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"); "be set to 0 or 1");
return -1; return -1;
} }
......
src/lxc/lsm/apparmor.c
...@@ -218,7 +218,7 @@ static int apparmor_process_label_set(const char *inlabel, struct lxc_conf *conf ...@@ -218,7 +218,7 @@ static int apparmor_process_label_set(const char *inlabel, struct lxc_conf *conf
WARN("Incomplete AppArmor support in your kernel"); WARN("Incomplete AppArmor support in your kernel");
if (!conf->lsm_aa_allow_incomplete) { if (!conf->lsm_aa_allow_incomplete) {
ERROR("If you really want to start this container, set"); 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"); ERROR("in your container configuration file");
return -1; return -1;
} }
......
src/tests/lxc-test-apparmor-mount
...@@ -213,7 +213,7 @@ run_cmd lxc-stop -n $cname -k ...@@ -213,7 +213,7 @@ run_cmd lxc-stop -n $cname -k
echo "testing override" echo "testing override"
sed -i '/aa_profile/d' $HDIR/.local/share/lxc/$cname/config 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-start -n $cname -d
run_cmd lxc-wait -n $cname -s RUNNING run_cmd lxc-wait -n $cname -s RUNNING
pid=`run_cmd lxc-info -p -H -n $cname` pid=`run_cmd lxc-info -p -H -n $cname`
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment