Skip to content

L
lxc
Commit b67771bc by 0x0916
Options

confile: rename lxc.utsname to lxc.uts.name

the legacy keys will be kept around until LXC 3.0 and then will be removed. Signed-off-by: 's avatar0x0916 <w@laoqinren.net>
parent 42e53c29
Showing with 73 additions and 57 deletions
doc/examples/lxc-complex.conf.in
# Container with network a complex network mixing macvlan, veth and # Container with network a complex network mixing macvlan, veth and
# physical network devices # physical network devices
lxc.utsname = complex lxc.uts.name = complex
lxc.net.0.type = veth lxc.net.0.type = veth
lxc.net.0.flags = up lxc.net.0.flags = up
lxc.net.0.link = br0 lxc.net.0.link = br0
......
doc/examples/lxc-empty-netns.conf.in
# Container with new network withtout network devices # Container with new network withtout network devices
lxc.utsname = omega lxc.uts.name = omega
lxc.net.0.type = empty lxc.net.0.type = empty
lxc.net.0.flags = up lxc.net.0.flags = up
doc/examples/lxc-macvlan.conf.in
# Container with network virtualized using the macvlan device driver # Container with network virtualized using the macvlan device driver
lxc.utsname = alpha lxc.uts.name = alpha
lxc.net.0.type = macvlan lxc.net.0.type = macvlan
lxc.net.0.flags = up lxc.net.0.flags = up
lxc.net.0.link = eth0 lxc.net.0.link = eth0
......
doc/examples/lxc-no-netns.conf.in
# Container with non-virtualized network # Container with non-virtualized network
lxc.net.0.type = none lxc.net.0.type = none
lxc.utsname = delta lxc.uts.name = delta
doc/examples/lxc-phys.conf.in
# Container with network virtualized using a physical network device with name # Container with network virtualized using a physical network device with name
# 'eth0' # 'eth0'
lxc.utsname = gamma lxc.uts.name = gamma
lxc.net.0.type = phys lxc.net.0.type = phys
lxc.net.0.flags = up lxc.net.0.flags = up
lxc.net.0.link = eth0 lxc.net.0.link = eth0
......
doc/examples/lxc-veth.conf.in
# Container with network virtualized using a pre-configured bridge named br0 and # Container with network virtualized using a pre-configured bridge named br0 and
# veth pair virtual network devices # veth pair virtual network devices
lxc.utsname = beta lxc.uts.name = beta
lxc.net.0.type = veth lxc.net.0.type = veth
lxc.net.0.flags = up lxc.net.0.flags = up
lxc.net.0.link = br0 lxc.net.0.link = br0
......
doc/examples/lxc-vlan.conf.in
# Container with network virtualized using the vlan device driver # Container with network virtualized using the vlan device driver
lxc.utsname = alpha lxc.uts.name = alpha
lxc.net.0.type = vlan lxc.net.0.type = vlan
lxc.net.0.vlan.id = 1234 lxc.net.0.vlan.id = 1234
lxc.net.0.flags = up lxc.net.0.flags = up
......
doc/ja/lxc.container.conf.sgml.in
...@@ -229,7 +229,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp> ...@@ -229,7 +229,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<variablelist> <variablelist>
<varlistentry> <varlistentry>
<term> <term>
<option>lxc.utsname</option> <option>lxc.uts.name</option>
</term> </term>
<listitem> <listitem>
<para> <para>
...@@ -2667,7 +2667,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp> ...@@ -2667,7 +2667,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
仮想ネットワークデバイスは、コンテナ内では eth0 とリネームされます。 仮想ネットワークデバイスは、コンテナ内では eth0 とリネームされます。
</para> </para>
<programlisting> <programlisting>
lxc.utsname = myhostname lxc.uts.name = myhostname
lxc.net.0.type = veth lxc.net.0.type = veth
lxc.net.0.flags = up lxc.net.0.flags = up
lxc.net.0.link = br0 lxc.net.0.link = br0
...@@ -2720,7 +2720,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp> ...@@ -2720,7 +2720,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
この例は、control group を使って、複雑なネットワークスタックを作成し、新しいホスト名を指定し、いくつかの場所をマウントし、ルートファイルシステムを変更するような複雑な設定を示します。 この例は、control group を使って、複雑なネットワークスタックを作成し、新しいホスト名を指定し、いくつかの場所をマウントし、ルートファイルシステムを変更するような複雑な設定を示します。
</para> </para>
<programlisting> <programlisting>
lxc.utsname = complex lxc.uts.name = complex
lxc.net.0.type = veth lxc.net.0.type = veth
lxc.net.0.flags = up lxc.net.0.flags = up
lxc.net.0.link = br0 lxc.net.0.link = br0
......
doc/ko/lxc.container.conf.sgml.in
...@@ -187,7 +187,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com> ...@@ -187,7 +187,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
<variablelist> <variablelist>
<varlistentry> <varlistentry>
<term> <term>
<option>lxc.utsname</option> <option>lxc.uts.name</option>
</term> </term>
<listitem> <listitem>
<para> <para>
...@@ -2563,7 +2563,7 @@ mknod errno 0 ...@@ -2563,7 +2563,7 @@ mknod errno 0
이 설정은 컨테이너가 한 쪽은 (이전에 시스템에 이미 생성된) br0 브리지에 연결되어 있는 veth 장치 쌍을 사용하도록 세팅한다. 가상 네트워크 장치는 컨테이너 내에서 eth0라는 이름을 갖는다. 이 설정은 컨테이너가 한 쪽은 (이전에 시스템에 이미 생성된) br0 브리지에 연결되어 있는 veth 장치 쌍을 사용하도록 세팅한다. 가상 네트워크 장치는 컨테이너 내에서 eth0라는 이름을 갖는다.
</para> </para>
<programlisting> <programlisting>
lxc.utsname = myhostname lxc.uts.name = myhostname
lxc.net.0.type = veth lxc.net.0.type = veth
lxc.net.0.flags = up lxc.net.0.flags = up
lxc.net.0.link = br0 lxc.net.0.link = br0
...@@ -2613,7 +2613,7 @@ mknod errno 0 ...@@ -2613,7 +2613,7 @@ mknod errno 0
아래의 예제는 복잡한 네트워크 스택, 컨트롤 그룹 사용, 호스트 이름 설정, 몇몇 장소 마운트, 루트 파일시스템 변경 등의 복잡한 설정을 보여준다. 아래의 예제는 복잡한 네트워크 스택, 컨트롤 그룹 사용, 호스트 이름 설정, 몇몇 장소 마운트, 루트 파일시스템 변경 등의 복잡한 설정을 보여준다.
</para> </para>
<programlisting> <programlisting>
lxc.utsname = complex lxc.uts.name = complex
lxc.net.0.type = veth lxc.net.0.type = veth
lxc.net.0.flags = up lxc.net.0.flags = up
lxc.net.0.link = br0 lxc.net.0.link = br0
......
doc/lxc.container.conf.sgml.in
...@@ -172,7 +172,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ...@@ -172,7 +172,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
<variablelist> <variablelist>
<varlistentry> <varlistentry>
<term> <term>
<option>lxc.utsname</option> <option>lxc.uts.name</option>
</term> </term>
<listitem> <listitem>
<para> <para>
...@@ -1932,7 +1932,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ...@@ -1932,7 +1932,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
virtual network device visible in the container is renamed to virtual network device visible in the container is renamed to
eth0.</para> eth0.</para>
<programlisting> <programlisting>
lxc.utsname = myhostname lxc.uts.name = myhostname
lxc.net.0.type = veth lxc.net.0.type = veth
lxc.net.0.flags = up lxc.net.0.flags = up
lxc.net.0.link = br0 lxc.net.0.link = br0
...@@ -1975,7 +1975,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ...@@ -1975,7 +1975,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
network stack, using the control groups, setting a new hostname, network stack, using the control groups, setting a new hostname,
mounting some locations and a changing root file system.</para> mounting some locations and a changing root file system.</para>
<programlisting> <programlisting>
lxc.utsname = complex lxc.uts.name = complex
lxc.net.0.type = veth lxc.net.0.type = veth
lxc.net.0.flags = up lxc.net.0.flags = up
lxc.net.0.link = br0 lxc.net.0.link = br0
......
src/lua-lxc/test/apitest.lua
...@@ -233,11 +233,11 @@ function test_config_items() ...@@ -233,11 +233,11 @@ function test_config_items()
log(0, "Test set/clear configuration items...") log(0, "Test set/clear configuration items...")
-- test setting a 'single type' item -- test setting a 'single type' item
assert(container:get_config_item("lxc.utsname") == optarg["n"]) assert(container:get_config_item("lxc.uts.name") == optarg["n"])
container:set_config_item("lxc.utsname", "foobar") container:set_config_item("lxc.uts.name", "foobar")
assert(container:get_config_item("lxc.utsname") == "foobar") assert(container:get_config_item("lxc.uts.name") == "foobar")
container:set_config_item("lxc.utsname", optarg["n"]) container:set_config_item("lxc.uts.name", optarg["n"])
assert(container:get_config_item("lxc.utsname") == optarg["n"]) assert(container:get_config_item("lxc.uts.name") == optarg["n"])
-- test clearing/setting a 'list type' item -- test clearing/setting a 'list type' item
container:clear_config_item("lxc.cap.drop") container:clear_config_item("lxc.cap.drop")
......
src/lxc/confile.c
...@@ -92,7 +92,7 @@ lxc_config_define(rootfs_mount); ...@@ -92,7 +92,7 @@ lxc_config_define(rootfs_mount);
lxc_config_define(rootfs_options); lxc_config_define(rootfs_options);
lxc_config_define(rootfs_backend); lxc_config_define(rootfs_backend);
lxc_config_define(rootfs); lxc_config_define(rootfs);
lxc_config_define(utsname); lxc_config_define(uts_name);
lxc_config_define(hooks); lxc_config_define(hooks);
lxc_config_define(net_type); lxc_config_define(net_type);
lxc_config_define(net_flags); lxc_config_define(net_flags);
...@@ -164,7 +164,13 @@ static struct lxc_config_t config[] = { ...@@ -164,7 +164,13 @@ static struct lxc_config_t config[] = {
{ "lxc.rootfs.options", set_config_rootfs_options, get_config_rootfs_options, clr_config_rootfs_options, }, { "lxc.rootfs.options", set_config_rootfs_options, get_config_rootfs_options, clr_config_rootfs_options, },
{ "lxc.rootfs.backend", set_config_rootfs_backend, get_config_rootfs_backend, clr_config_rootfs_backend, }, { "lxc.rootfs.backend", set_config_rootfs_backend, get_config_rootfs_backend, clr_config_rootfs_backend, },
{ "lxc.rootfs", set_config_rootfs, get_config_rootfs, clr_config_rootfs, }, { "lxc.rootfs", set_config_rootfs, get_config_rootfs, clr_config_rootfs, },
{ "lxc.utsname", set_config_utsname, get_config_utsname, clr_config_utsname, },
/* REMOVE IN LXC 3.0
legacy utsname key
*/
{ "lxc.utsname", set_config_uts_name, get_config_uts_name, clr_config_uts_name, },
{ "lxc.uts.name", set_config_uts_name, get_config_uts_name, clr_config_uts_name, },
{ "lxc.hook.pre-start", set_config_hooks, get_config_hooks, clr_config_hooks, }, { "lxc.hook.pre-start", set_config_hooks, get_config_hooks, clr_config_hooks, },
{ "lxc.hook.pre-mount", set_config_hooks, get_config_hooks, clr_config_hooks, }, { "lxc.hook.pre-mount", set_config_hooks, get_config_hooks, clr_config_hooks, },
{ "lxc.hook.mount", set_config_hooks, get_config_hooks, clr_config_hooks, }, { "lxc.hook.mount", set_config_hooks, get_config_hooks, clr_config_hooks, },
...@@ -2059,13 +2065,13 @@ static int set_config_rootfs_backend(const char *key, const char *value, ...@@ -2059,13 +2065,13 @@ static int set_config_rootfs_backend(const char *key, const char *value,
return set_config_string_item(&lxc_conf->rootfs.bdev_type, value); return set_config_string_item(&lxc_conf->rootfs.bdev_type, value);
} }
static int set_config_utsname(const char *key, const char *value, static int set_config_uts_name(const char *key, const char *value,
struct lxc_conf *lxc_conf, void *data) struct lxc_conf *lxc_conf, void *data)
{ {
struct utsname *utsname; struct utsname *utsname;
if (lxc_config_value_empty(value)) { if (lxc_config_value_empty(value)) {
clr_config_utsname(key, lxc_conf, NULL); clr_config_uts_name(key, lxc_conf, NULL);
return 0; return 0;
} }
...@@ -3050,7 +3056,7 @@ static int get_config_rootfs_backend(const char *key, char *retv, int inlen, ...@@ -3050,7 +3056,7 @@ static int get_config_rootfs_backend(const char *key, char *retv, int inlen,
return lxc_get_conf_str(retv, inlen, c->rootfs.bdev_type); return lxc_get_conf_str(retv, inlen, c->rootfs.bdev_type);
} }
static int get_config_utsname(const char *key, char *retv, int inlen, static int get_config_uts_name(const char *key, char *retv, int inlen,
struct lxc_conf *c, void *data) struct lxc_conf *c, void *data)
{ {
return lxc_get_conf_str( return lxc_get_conf_str(
...@@ -3472,7 +3478,7 @@ static inline int clr_config_rootfs_backend(const char *key, struct lxc_conf *c, ...@@ -3472,7 +3478,7 @@ static inline int clr_config_rootfs_backend(const char *key, struct lxc_conf *c,
return 0; return 0;
} }
static inline int clr_config_utsname(const char *key, struct lxc_conf *c, static inline int clr_config_uts_name(const char *key, struct lxc_conf *c,
void *data) void *data)
{ {
free(c->utsname); free(c->utsname);
......
src/lxc/lxccontainer.c
...@@ -3211,8 +3211,9 @@ static struct lxc_container *do_lxcapi_clone(struct lxc_container *c, const char ...@@ -3211,8 +3211,9 @@ static struct lxc_container *do_lxcapi_clone(struct lxc_container *c, const char
// update utsname // update utsname
if (!(flags & LXC_CLONE_KEEPNAME)) { if (!(flags & LXC_CLONE_KEEPNAME)) {
clear_unexp_config_line(c2->lxc_conf, "lxc.utsname", false); clear_unexp_config_line(c2->lxc_conf, "lxc.utsname", false);
clear_unexp_config_line(c2->lxc_conf, "lxc.uts.name", false);
if (!set_config_item_locked(c2, "lxc.utsname", newname)) { if (!set_config_item_locked(c2, "lxc.uts.name", newname)) {
ERROR("Error setting new hostname"); ERROR("Error setting new hostname");
goto out; goto out;
} }
......
src/python-lxc/examples/api_test.py
...@@ -71,7 +71,7 @@ container.create("download", 0, ...@@ -71,7 +71,7 @@ container.create("download", 0,
assert(container.defined) assert(container.defined)
assert(container.name == CONTAINER_NAME assert(container.name == CONTAINER_NAME
== container.get_config_item("lxc.utsname")) == container.get_config_item("lxc.uts.name"))
assert(container.name in lxc.list_containers()) assert(container.name in lxc.list_containers())
## Test the config ## Test the config
...@@ -131,8 +131,8 @@ assert(len(ips) > 0) ...@@ -131,8 +131,8 @@ assert(len(ips) > 0)
## Test running config ## Test running config
assert(container.name == CONTAINER_NAME assert(container.name == CONTAINER_NAME
== container.get_config_item("lxc.utsname") == container.get_config_item("lxc.uts.name")
== container.get_running_config_item("lxc.utsname")) == container.get_running_config_item("lxc.uts.name"))
## Testing cgroups a bit ## Testing cgroups a bit
print("Testing cgroup API") print("Testing cgroup API")
......
src/tests/parse_config_file.c
...@@ -531,13 +531,22 @@ int main(int argc, char *argv[]) ...@@ -531,13 +531,22 @@ int main(int argc, char *argv[])
goto non_test_error; goto non_test_error;
} }
/* lxc.utsname */ /* REMOVE IN LXC 3.0
legacy lxc.utsname key
*/
if (set_get_compare_clear_save_load(c, "lxc.utsname", "the-shire", tmpf, if (set_get_compare_clear_save_load(c, "lxc.utsname", "the-shire", tmpf,
true) < 0) { true) < 0) {
lxc_error("%s\n", "lxc.utsname"); lxc_error("%s\n", "lxc.utsname");
goto non_test_error; goto non_test_error;
} }
/* lxc.uts.name */
if (set_get_compare_clear_save_load(c, "lxc.uts.name", "the-shire", tmpf,
true) < 0) {
lxc_error("%s\n", "lxc.uts.name");
goto non_test_error;
}
/* lxc.hook.pre-start */ /* lxc.hook.pre-start */
if (set_get_compare_clear_save_load( if (set_get_compare_clear_save_load(
c, "lxc.hook.pre-start", "/some/pre-start", tmpf, false) < 0) { c, "lxc.hook.pre-start", "/some/pre-start", tmpf, false) < 0) {
......
src/tests/startone.c
...@@ -154,8 +154,8 @@ int main(int argc, char *argv[]) ...@@ -154,8 +154,8 @@ int main(int argc, char *argv[])
goto out; goto out;
} }
if (!c->set_config_item(c, "lxc.utsname", "bobo")) { if (!c->set_config_item(c, "lxc.uts.name", "bobo")) {
fprintf(stderr, "%d: failed setting lxc.utsname\n", __LINE__); fprintf(stderr, "%d: failed setting lxc.uts.name\n", __LINE__);
goto out; goto out;
} }
......
templates/lxc-alpine.in
...@@ -388,7 +388,7 @@ configure_container() { ...@@ -388,7 +388,7 @@ configure_container() {
lxc.arch = $arch lxc.arch = $arch
# Set hostname. # Set hostname.
lxc.utsname = $hostname lxc.uts.name = $hostname
# If something doesn't work, try to comment this out. # If something doesn't work, try to comment this out.
# Dropping sys_admin disables container root from doing a lot of things # Dropping sys_admin disables container root from doing a lot of things
......
templates/lxc-altlinux.in
...@@ -267,7 +267,7 @@ copy_configuration() ...@@ -267,7 +267,7 @@ copy_configuration()
mkdir -p $config_path mkdir -p $config_path
grep -q "^lxc.rootfs" $config_path/config 2>/dev/null || echo "lxc.rootfs = $rootfs_path" >> $config_path/config grep -q "^lxc.rootfs" $config_path/config 2>/dev/null || echo "lxc.rootfs = $rootfs_path" >> $config_path/config
cat <<EOF >> $config_path/config cat <<EOF >> $config_path/config
lxc.utsname = $name lxc.uts.name = $name
lxc.tty = 4 lxc.tty = 4
lxc.pts = 1024 lxc.pts = 1024
lxc.cap.drop = sys_module mac_admin mac_override sys_time lxc.cap.drop = sys_module mac_admin mac_override sys_time
......
templates/lxc-archlinux.in
...@@ -148,7 +148,7 @@ EOF ...@@ -148,7 +148,7 @@ EOF
copy_configuration() { copy_configuration() {
mkdir -p "${config_path}" mkdir -p "${config_path}"
local config="${config_path}/config" local config="${config_path}/config"
echo "lxc.utsname = ${name}" >> "${config}" echo "lxc.uts.name = ${name}" >> "${config}"
grep -q "^lxc.arch" "${config}" 2>/dev/null \ grep -q "^lxc.arch" "${config}" 2>/dev/null \
|| echo "lxc.arch = ${arch}" >> "${config}" || echo "lxc.arch = ${arch}" >> "${config}"
grep -q "^lxc.rootfs" "${config}" 2>/dev/null \ grep -q "^lxc.rootfs" "${config}" 2>/dev/null \
......
templates/lxc-busybox.in
...@@ -343,7 +343,7 @@ grep -q "^lxc.rootfs" $path/config 2>/dev/null || echo "lxc.rootfs = $rootfs" >> ...@@ -343,7 +343,7 @@ grep -q "^lxc.rootfs" $path/config 2>/dev/null || echo "lxc.rootfs = $rootfs" >>
cat <<EOF >> $path/config cat <<EOF >> $path/config
lxc.signal.halt = SIGUSR1 lxc.signal.halt = SIGUSR1
lxc.rebootsignal = SIGTERM lxc.rebootsignal = SIGTERM
lxc.utsname = $name lxc.uts.name = $name
lxc.tty = 1 lxc.tty = 1
lxc.pts = 1 lxc.pts = 1
lxc.cap.drop = sys_module mac_admin mac_override sys_time lxc.cap.drop = sys_module mac_admin mac_override sys_time
......
templates/lxc-centos.in
...@@ -641,7 +641,7 @@ lxc.include = @LXCTEMPLATECONFIG@/centos.common.conf ...@@ -641,7 +641,7 @@ lxc.include = @LXCTEMPLATECONFIG@/centos.common.conf
# Append things which require expansion here... # Append things which require expansion here...
cat <<EOF >> $config_path/config cat <<EOF >> $config_path/config
lxc.arch = $arch lxc.arch = $arch
lxc.utsname = $utsname lxc.uts.name = $utsname
# When using LXC with apparmor, uncomment the next line to run unconfined: # When using LXC with apparmor, uncomment the next line to run unconfined:
#lxc.aa_profile = unconfined #lxc.aa_profile = unconfined
......
templates/lxc-cirros.in
...@@ -123,7 +123,7 @@ lxc.rootfs = $rootfs ...@@ -123,7 +123,7 @@ lxc.rootfs = $rootfs
lxc.tty = 4 lxc.tty = 4
lxc.pts = 1024 lxc.pts = 1024
lxc.utsname = $name lxc.uts.name = $name
lxc.arch = $arch lxc.arch = $arch
lxc.cap.drop = sys_module mac_admin mac_override sys_time lxc.cap.drop = sys_module mac_admin mac_override sys_time
......
templates/lxc-debian.in
...@@ -515,7 +515,7 @@ copy_configuration() ...@@ -515,7 +515,7 @@ copy_configuration()
cat <<EOF >> $path/config cat <<EOF >> $path/config
lxc.tty = $num_tty lxc.tty = $num_tty
lxc.utsname = $hostname lxc.uts.name = $hostname
lxc.arch = $arch lxc.arch = $arch
lxc.pts=1023 lxc.pts=1023
EOF EOF
......
templates/lxc-download.in
...@@ -547,7 +547,7 @@ fi ...@@ -547,7 +547,7 @@ fi
if [ -e "$fstab" ]; then if [ -e "$fstab" ]; then
echo "lxc.mount = ${LXC_PATH}/fstab" >> ${LXC_PATH}/config echo "lxc.mount = ${LXC_PATH}/fstab" >> ${LXC_PATH}/config
fi fi
echo "lxc.utsname = ${LXC_NAME}" >> ${LXC_PATH}/config echo "lxc.uts.name = ${LXC_NAME}" >> ${LXC_PATH}/config
## Re-add the previously removed network config ## Re-add the previously removed network config
if [ -e "${LXC_PATH}/config-network" ]; then if [ -e "${LXC_PATH}/config-network" ]; then
......
templates/lxc-fedora-legacy.in
...@@ -1127,7 +1127,7 @@ lxc.include = @LXCTEMPLATECONFIG@/fedora.common.conf ...@@ -1127,7 +1127,7 @@ lxc.include = @LXCTEMPLATECONFIG@/fedora.common.conf
# Append things which require expansion here... # Append things which require expansion here...
cat <<EOF >> $config_path/config cat <<EOF >> $config_path/config
lxc.arch = $arch lxc.arch = $arch
lxc.utsname = $utsname lxc.uts.name = $utsname
# When using LXC with apparmor, uncomment the next line to run unconfined: # When using LXC with apparmor, uncomment the next line to run unconfined:
#lxc.aa_profile = unconfined #lxc.aa_profile = unconfined
......
templates/lxc-fedora.in
...@@ -486,7 +486,7 @@ lxc.include = ${lxc_template_config}/fedora.common.conf ...@@ -486,7 +486,7 @@ lxc.include = ${lxc_template_config}/fedora.common.conf
cat <<EOF >> "${path}/config" cat <<EOF >> "${path}/config"
# Container specific configuration # Container specific configuration
lxc.arch = ${basearch} lxc.arch = ${basearch}
lxc.utsname = ${utsname} lxc.uts.name = ${utsname}
# When using LXC with apparmor, uncomment the next line to run unconfined: # When using LXC with apparmor, uncomment the next line to run unconfined:
#lxc.aa_profile = unconfined #lxc.aa_profile = unconfined
......
templates/lxc-gentoo.in
...@@ -705,7 +705,7 @@ container_conf() ...@@ -705,7 +705,7 @@ container_conf()
${conf_arch_line} ${conf_arch_line}
# set the hostname # set the hostname
lxc.utsname = ${name} lxc.uts.name = ${name}
lxc.tty = ${tty} lxc.tty = ${tty}
${conf_rootfs_line} ${conf_rootfs_line}
......
templates/lxc-openmandriva.in
...@@ -228,7 +228,7 @@ copy_configuration() ...@@ -228,7 +228,7 @@ copy_configuration()
mkdir -p $config_path mkdir -p $config_path
grep -q "^lxc.rootfs" $config_path/config 2>/dev/null || echo "lxc.rootfs = $rootfs_path" >> $config_path/config grep -q "^lxc.rootfs" $config_path/config 2>/dev/null || echo "lxc.rootfs = $rootfs_path" >> $config_path/config
cat <<EOF >> $config_path/config cat <<EOF >> $config_path/config
lxc.utsname = $name lxc.uts.name = $name
lxc.tty = 4 lxc.tty = 4
lxc.pts = 1024 lxc.pts = 1024
lxc.cap.drop = sys_module mac_admin mac_override sys_time lxc.cap.drop = sys_module mac_admin mac_override sys_time
......
templates/lxc-opensuse.in
...@@ -350,7 +350,7 @@ lxc.include = @LXCTEMPLATECONFIG@/opensuse.common.conf ...@@ -350,7 +350,7 @@ lxc.include = @LXCTEMPLATECONFIG@/opensuse.common.conf
# Append things which require expansion here... # Append things which require expansion here...
cat <<EOF >> $path/config cat <<EOF >> $path/config
lxc.arch = $arch lxc.arch = $arch
lxc.utsname = $name lxc.uts.name = $name
lxc.mount.auto = cgroup:mixed proc:mixed sys:mixed lxc.mount.auto = cgroup:mixed proc:mixed sys:mixed
......
templates/lxc-oracle.in
...@@ -482,7 +482,7 @@ container_config_create() ...@@ -482,7 +482,7 @@ container_config_create()
cat <<EOF >> $cfg_dir/config || die "unable to create $cfg_dir/config" cat <<EOF >> $cfg_dir/config || die "unable to create $cfg_dir/config"
# Container configuration for Oracle Linux $container_release_major.$container_release_minor # Container configuration for Oracle Linux $container_release_major.$container_release_minor
lxc.arch = $arch lxc.arch = $arch
lxc.utsname = $name lxc.uts.name = $name
EOF EOF
grep -q "^lxc.rootfs" $cfg_dir/config 2>/dev/null || echo "lxc.rootfs = $container_rootfs" >> $cfg_dir/config grep -q "^lxc.rootfs" $cfg_dir/config 2>/dev/null || echo "lxc.rootfs = $container_rootfs" >> $cfg_dir/config
......
templates/lxc-plamo.in
...@@ -233,7 +233,7 @@ configure_plamo() { ...@@ -233,7 +233,7 @@ configure_plamo() {
copy_configuration() { copy_configuration() {
ret=0 ret=0
cat <<- EOF >> $path/config || let ret++ cat <<- EOF >> $path/config || let ret++
lxc.utsname = $name lxc.uts.name = $name
lxc.arch = $arch lxc.arch = $arch
EOF EOF
if [ -f "@LXCTEMPLATECONFIG@/plamo.common.conf" ] ; then if [ -f "@LXCTEMPLATECONFIG@/plamo.common.conf" ] ; then
......
templates/lxc-pld.in
...@@ -238,7 +238,7 @@ copy_configuration() ...@@ -238,7 +238,7 @@ copy_configuration()
cat <<EOF >> $config_path/config cat <<EOF >> $config_path/config
# Most of below settings should be taken as defaults from # Most of below settings should be taken as defaults from
# lxc.include = /usr/share/lxc/config/common.conf # lxc.include = /usr/share/lxc/config/common.conf
lxc.utsname = $utsname lxc.uts.name = $utsname
lxc.tty = 4 lxc.tty = 4
lxc.pts = 1024 lxc.pts = 1024
# Consider if below line is right for systemd container # Consider if below line is right for systemd container
......
templates/lxc-sabayon.in
...@@ -324,7 +324,7 @@ lxc.cgroup.devices.allow = c 10:229 rwm ...@@ -324,7 +324,7 @@ lxc.cgroup.devices.allow = c 10:229 rwm
lxc.arch = $arch lxc.arch = $arch
# Set hostname. # Set hostname.
lxc.utsname = $hostname lxc.uts.name = $hostname
# Include common configuration. # Include common configuration.
lxc.include = $LXC_TEMPLATE_CONFIG/sabayon.common.conf lxc.include = $LXC_TEMPLATE_CONFIG/sabayon.common.conf
......
templates/lxc-slackware.in
...@@ -638,7 +638,7 @@ name=$3 ...@@ -638,7 +638,7 @@ name=$3
cat <<EOF >> $path/config cat <<EOF >> $path/config
lxc.utsname = $name lxc.uts.name = $name
lxc.arch = $arch lxc.arch = $arch
lxc.mount = $rootfs/etc/fstab lxc.mount = $rootfs/etc/fstab
......
templates/lxc-sparclinux.in
...@@ -316,7 +316,7 @@ container_config_create() ...@@ -316,7 +316,7 @@ container_config_create()
cat <<EOF >> $cfg_dir/config || die "unable to create $cfg_dir/config" cat <<EOF >> $cfg_dir/config || die "unable to create $cfg_dir/config"
# Container configuration for Linux for SPARC $container_release_major.$container_release_minor # Container configuration for Linux for SPARC $container_release_major.$container_release_minor
lxc.arch = $arch lxc.arch = $arch
lxc.utsname = $name lxc.uts.name = $name
EOF EOF
grep -q "^lxc.rootfs" $cfg_dir/config 2>/dev/null || echo "lxc.rootfs = $container_rootfs" >> $cfg_dir/config grep -q "^lxc.rootfs" $cfg_dir/config 2>/dev/null || echo "lxc.rootfs = $container_rootfs" >> $cfg_dir/config
......
templates/lxc-sshd.in
...@@ -129,7 +129,7 @@ copy_configuration() ...@@ -129,7 +129,7 @@ copy_configuration()
grep -q "^lxc.rootfs" $path/config 2>/dev/null || echo "lxc.rootfs = $rootfs" >> $path/config grep -q "^lxc.rootfs" $path/config 2>/dev/null || echo "lxc.rootfs = $rootfs" >> $path/config
cat <<EOF >> $path/config cat <<EOF >> $path/config
lxc.utsname = $name lxc.uts.name = $name
lxc.pts = 1024 lxc.pts = 1024
lxc.cap.drop = sys_module mac_admin mac_override sys_time lxc.cap.drop = sys_module mac_admin mac_override sys_time
......
templates/lxc-ubuntu-cloud.in
...@@ -91,7 +91,7 @@ copy_configuration() ...@@ -91,7 +91,7 @@ copy_configuration()
[ -e "$path/config-auto" ] && cat $path/config-auto >> $path/config && rm $path/config-auto [ -e "$path/config-auto" ] && cat $path/config-auto >> $path/config && rm $path/config-auto
grep -q "^lxc.rootfs" $path/config 2>/dev/null || echo "lxc.rootfs = $rootfs" >> $path/config grep -q "^lxc.rootfs" $path/config 2>/dev/null || echo "lxc.rootfs = $rootfs" >> $path/config
cat <<EOF >> $path/config cat <<EOF >> $path/config
lxc.utsname = $name lxc.uts.name = $name
lxc.arch = $arch lxc.arch = $arch
EOF EOF
......
templates/lxc-ubuntu.in
...@@ -531,7 +531,7 @@ copy_configuration() ...@@ -531,7 +531,7 @@ copy_configuration()
[ -e "$path/config-auto" ] && cat $path/config-auto >> $path/config && rm $path/config-auto [ -e "$path/config-auto" ] && cat $path/config-auto >> $path/config && rm $path/config-auto
grep -q "^lxc.rootfs" $path/config 2>/dev/null || echo "lxc.rootfs = $rootfs" >> $path/config grep -q "^lxc.rootfs" $path/config 2>/dev/null || echo "lxc.rootfs = $rootfs" >> $path/config
cat <<EOF >> $path/config cat <<EOF >> $path/config
lxc.utsname = $name lxc.uts.name = $name
lxc.arch = $arch lxc.arch = $arch
EOF EOF
......
templates/lxc-voidlinux.in
...@@ -68,7 +68,7 @@ declare -a additional_packages ...@@ -68,7 +68,7 @@ declare -a additional_packages
copy_configuration() { copy_configuration() {
mkdir -p "${config_path}" mkdir -p "${config_path}"
local config="${config_path}/config" local config="${config_path}/config"
echo "lxc.utsname = ${name}" >> "${config}" echo "lxc.uts.name = ${name}" >> "${config}"
grep -q "^lxc.rootfs" "${config}" 2>/dev/null \ grep -q "^lxc.rootfs" "${config}" 2>/dev/null \
|| echo "lxc.rootfs = ${rootfs_path}" >> "${config}" || echo "lxc.rootfs = ${rootfs_path}" >> "${config}"
......
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