doc: s/se_context/selinux.context/g

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

diff --git a/config/selinux/lxc.te b/config/selinux/lxc.te
index 4ecb9db78ddab7872c01c5b8e6048e7118d94fde..bb4bfe3a8feb664d363b7cb8590cb4e82aef9e16 100644 (file)
--- a/config/selinux/lxc.te
+++ b/config/selinux/lxc.te
@@ -7,7 +7,7 @@
 # semodule -i lxc.pp
 #
 # In your container's lxc config:
-#   lxc.se_context = system_u:system_r:lxc_t:s0:c62,c86,c150,c228
+#   lxc.selinux.context = system_u:system_r:lxc_t:s0:c62,c86,c150,c228
 #
 # Ensure your container's rootfs files are labeled:
 #   chcon -R system_u:object_r:lxc_file_t:s0:c62,c86,c150,c228 /path/to/rootfs

diff --git a/doc/ja/lxc.container.conf.sgml.in b/doc/ja/lxc.container.conf.sgml.in
index 54616b6923b50e8e026f9d75e4232b6de57afc7a..93adae36dac7acf4795ebcdb2c0f95f88b8c0213 100644 (file)
--- a/doc/ja/lxc.container.conf.sgml.in
+++ b/doc/ja/lxc.container.conf.sgml.in
@@ -1764,7 +1764,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
       <variablelist>
         <varlistentry>
           <term>
-            <option>lxc.se_context</option>
+            <option>lxc.selinux.context</option>
           </term>
           <listitem>
             <para>
@@ -1774,7 +1774,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
               -->
               コンテナが従うべき SELinux コンテキストを指定するか、<command>unconfined_t</command> を指定します。例えば以下のように設定します。
             </para>
-            <programlisting>lxc.se_context = system_u:system_r:lxc_t:s0:c22</programlisting>
+            <programlisting>lxc.selinux.context = system_u:system_r:lxc_t:s0:c22</programlisting>
           </listitem>
         </varlistentry>
       </variablelist>

diff --git a/doc/ko/lxc.container.conf.sgml.in b/doc/ko/lxc.container.conf.sgml.in
index 49077b709a59f4043368dbaa011e0125eeca308a..76c3655d70a90da52ea19eb9cbbfd5fd17850656 100644 (file)
--- a/doc/ko/lxc.container.conf.sgml.in
+++ b/doc/ko/lxc.container.conf.sgml.in
@@ -1704,7 +1704,7 @@ proc proc proc nodev,noexec,nosuid 0 0
       <variablelist>
        <varlistentry>
          <term>
-           <option>lxc.se_context</option>
+           <option>lxc.selinux.context</option>
          </term>
          <listitem>
            <para>
@@ -1714,7 +1714,7 @@ proc proc proc nodev,noexec,nosuid 0 0
               -->
               컨테이너가 따라야할 SELinux 컨텍스트를 지정하거나, <command>unconfined_t</command>를 지정할 수 있다. 예를 들어 아래와 같이 지정 가능하다.
            </para>
-           <programlisting>lxc.se_context = system_u:system_r:lxc_t:s0:c22</programlisting>
+           <programlisting>lxc.selinux.context = system_u:system_r:lxc_t:s0:c22</programlisting>
          </listitem>
        </varlistentry>
       </variablelist>

diff --git a/doc/lxc.container.conf.sgml.in b/doc/lxc.container.conf.sgml.in
index 287c8b9feca2ed0c065075a94eb6992c086f69d0..f3b594ea084fa28d334d8588eac14dee402cce13 100644 (file)
--- a/doc/lxc.container.conf.sgml.in
+++ b/doc/lxc.container.conf.sgml.in
@@ -1278,14 +1278,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
       <variablelist>
         <varlistentry>
           <term>
-            <option>lxc.se_context</option>
+            <option>lxc.selinux.context</option>
           </term>
           <listitem>
             <para>
               Specify the SELinux context under which the container should
               be run or <command>unconfined_t</command>. For example
             </para>
-            <programlisting>lxc.se_context = system_u:system_r:lxc_t:s0:c22</programlisting>
+            <programlisting>lxc.selinux.context = system_u:system_r:lxc_t:s0:c22</programlisting>
           </listitem>
         </varlistentry>
       </variablelist>

diff --git a/src/tests/attach.c b/src/tests/attach.c
index 985cea03babd1a9b5406bbbe8be36bfd776c26cd..02c221e1a8511d0d4c43735e4e7630297a694b72 100644 (file)
--- a/src/tests/attach.c
+++ b/src/tests/attach.c
@@ -51,7 +51,7 @@ static void test_lsm_detect(void)
 {
        if (lsm_enabled()) {
                if (!strcmp(lsm_name(), "SELinux")) {
-                       lsm_config_key = "lxc.se_context";
+                       lsm_config_key = "lxc.selinux.context";
                        lsm_label      = "unconfined_u:unconfined_r:lxc_t:s0-s0:c0.c1023";
                }
                else if (!strcmp(lsm_name(), "AppArmor")) {