[lxc-devel] [linuxcontainers.org/master] s/id_map/idmap

[jomo on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 423 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20181022/f0f84bc9/attachment.bin>
-------------- next part --------------
From 2532c477deddbc596ba37bfe17c46069d7911104 Mon Sep 17 00:00:00 2001
From: jomo <git at jomo.tv>
Date: Mon, 22 Oct 2018 03:13:46 +0200
Subject: [PATCH] s/id_map/idmap

This configuration key has been renamed in LXC 2.1
but the old key was still used in getting-started.

Signed-off-by: Yoi Warai <git at jomo.tv>
---
 content/lxc/getting-started.ja.md | 4 ++--
 content/lxc/getting-started.ko.md | 2 +-
 content/lxc/getting-started.md    | 2 +-
 content/lxc/getting-started.ru.md | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/content/lxc/getting-started.ja.md b/content/lxc/getting-started.ja.md
index 5160aa8..f33c37c 100644
--- a/content/lxc/getting-started.ja.md
+++ b/content/lxc/getting-started.ja.md
@@ -258,10 +258,10 @@ you'll need to follow only a subset of the steps above.
 
 <!--
 Specifically, you need to manually allocate a uid and gid range to root in /etc/subuid and /etc/subgid.
-And then set that range in /etc/lxc/default.conf using lxc.id\_map entries similar to those above.
+And then set that range in /etc/lxc/default.conf using lxc.idmap entries similar to those above.
 -->
 具体的に言うと、root に対して割り当てる uid と gid の範囲を /etc/subuid と /etc/subgid に割り当てる必要があります。
-そして、その範囲を先と同様に /etc/lxc/default.conf に lxc.id\_map を使って設定します。
+そして、その範囲を先と同様に /etc/lxc/default.conf に lxc.idmap を使って設定します。
 
 <!--
 And that's it. Root doesn't need network devices quota and uses the
diff --git a/content/lxc/getting-started.ko.md b/content/lxc/getting-started.ko.md
index fac2c52..5d89941 100644
--- a/content/lxc/getting-started.ko.md
+++ b/content/lxc/getting-started.ko.md
@@ -111,7 +111,7 @@ download 템플릿은 선택할 수 있는 배포판 버전, 아키텍처 목록
 시스템 전역적인 비특권 컨테이너를 실행하기 위해서는 (root가 비특권 컨테이너를 실행하는 경우), 위 단계중 일부만 따라해도 됩니다.
 
 구체적으로 말하면, root에 uid와 gid를 /etc/subuid와 /etc/subgid로 할당할 필요가 있습니다.
-그리고 /etc/lxc/default.conf의 lxc.id\_map 항목에 위와 동일하게 범위를 설정해 줘야 합니다.
+그리고 /etc/lxc/default.conf의 lxc.idmap 항목에 위와 동일하게 범위를 설정해 줘야 합니다.
 
 root의 경우 네트워크 장치 사용 할당은 설정해줄 필요가 없습니다. 그리고 전역적인 설정파일을 사용하므로 다음 단계가 필요하지 않습니다.
 
diff --git a/content/lxc/getting-started.md b/content/lxc/getting-started.md
index 388eff4..b2e27a5 100644
--- a/content/lxc/getting-started.md
+++ b/content/lxc/getting-started.md
@@ -133,7 +133,7 @@ To run a system-wide unprivileged container (that is, an unprivileged container
 you'll need to follow only a subset of the steps above.
 
 Specifically, you need to manually allocate a uid and gid range to root in /etc/subuid and /etc/subgid.
-And then set that range in /etc/lxc/default.conf using lxc.id\_map entries similar to those above.
+And then set that range in /etc/lxc/default.conf using lxc.idmap entries similar to those above.
 
 And that's it. Root doesn't need network devices quota and uses the
 global configuration file so the other steps don't apply.
diff --git a/content/lxc/getting-started.ru.md b/content/lxc/getting-started.ru.md
index d80d69d..20bba49 100644
--- a/content/lxc/getting-started.ru.md
+++ b/content/lxc/getting-started.ru.md
@@ -87,8 +87,8 @@ Ubuntu также один из (если не единственный) дис
  * Создайте директорию ~/.config/lxc если она не существует.
  * Скопируйте /etc/lxc/default.conf в ~/.config/lxc/default.conf
  * Добавьте в него следующие две линии:
-    * lxc.id\_map = u 0 100000 65536
-    * lxc.id\_map = g 0 100000 65536
+    * lxc.idmap = u 0 100000 65536
+    * lxc.idmap = g 0 100000 65536
 
 Эти значения должны совпадать со значениями в /etc/subuid и /etc/subgid, значения выше подходят
 для первого пользователя на стандартной системе Ubuntu.
@@ -133,7 +133,7 @@ Ubuntu также один из (если не единственный) дис
 вы должны следовать только части шагов ниже.
 
 А именно, вам нужно вручную выделить диапазон uid и gid для root в /etc/subuid and /etc/subgid.
-А затем задать этот диапазон в /etc/lxc/default.conf используя такие же записи lxc.id\_map как выше.
+А затем задать этот диапазон в /etc/lxc/default.conf используя такие же записи lxc.idmap как выше.
 
 И все. Root не требует квоты на сетевые устройства и использует
 общий конфигурационный файл так что другие шаги не применяются.