From 2cf44a2f03eab777fbf2ac2dfde47229eecfd2e1 Mon Sep 17 00:00:00 2001 From: Naoto Yamaguchi Date: Sat, 13 Nov 2021 19:20:31 +0900 Subject: Improvement flexibility for lxc-config Existing lxc config creation recipe is supporting two type string replacing. The network interface setting has required to multi line replacing at aec683913cd645fcf18d7633a12a7b4b42215f69. These flexibility will support by container manager that is under developing. But we need quick solution for that now. This patch provide quick solution. This patch support any network interface usage in guest. Bug-AGL: SPEC-4132 Signed-off-by: Naoto Yamaguchi Change-Id: I5da97492610124ddfe050660e0cc2c2c5559d5b9 --- .../recipes-container/lxc-config/lxc-config-dummy/basic.in | 9 +++++++++ .../recipes-container/lxc-config/lxc-config-dummy/environment.in | 2 ++ .../recipes-container/lxc-config/lxc-config-dummy/misc.in | 3 +++ .../recipes-container/lxc-config/lxc-config-dummy/mount.in | 7 +++++++ .../recipes-container/lxc-config/lxc-config-dummy/network.in | 3 +++ .../lxc-config/lxc-config-dummy/system.conf.dummy.in | 2 ++ 6 files changed, 26 insertions(+) create mode 100644 meta-agl-lxc/recipes-container/lxc-config/lxc-config-dummy/basic.in create mode 100644 meta-agl-lxc/recipes-container/lxc-config/lxc-config-dummy/environment.in create mode 100644 meta-agl-lxc/recipes-container/lxc-config/lxc-config-dummy/misc.in create mode 100644 meta-agl-lxc/recipes-container/lxc-config/lxc-config-dummy/mount.in create mode 100644 meta-agl-lxc/recipes-container/lxc-config/lxc-config-dummy/network.in create mode 100644 meta-agl-lxc/recipes-container/lxc-config/lxc-config-dummy/system.conf.dummy.in (limited to 'meta-agl-lxc/recipes-container/lxc-config/lxc-config-dummy') diff --git a/meta-agl-lxc/recipes-container/lxc-config/lxc-config-dummy/basic.in b/meta-agl-lxc/recipes-container/lxc-config/lxc-config-dummy/basic.in new file mode 100644 index 00000000..603e902e --- /dev/null +++ b/meta-agl-lxc/recipes-container/lxc-config/lxc-config-dummy/basic.in @@ -0,0 +1,9 @@ +# lxc basic setting +lxc.rootfs.path = dir:/var/lib/machines/dummy +lxc.signal.halt = SIGRTMIN+3 +lxc.signal.reboot = SIGTERM +lxc.uts.name = "guest-dummy" +lxc.tty.max = 1 +lxc.pty.max = 1 +lxc.cap.drop = sys_module mac_admin mac_override sys_time + diff --git a/meta-agl-lxc/recipes-container/lxc-config/lxc-config-dummy/environment.in b/meta-agl-lxc/recipes-container/lxc-config/lxc-config-dummy/environment.in new file mode 100644 index 00000000..b7cde1c8 --- /dev/null +++ b/meta-agl-lxc/recipes-container/lxc-config/lxc-config-dummy/environment.in @@ -0,0 +1,2 @@ +# lxc environment variable setting + diff --git a/meta-agl-lxc/recipes-container/lxc-config/lxc-config-dummy/misc.in b/meta-agl-lxc/recipes-container/lxc-config/lxc-config-dummy/misc.in new file mode 100644 index 00000000..9b4f4883 --- /dev/null +++ b/meta-agl-lxc/recipes-container/lxc-config/lxc-config-dummy/misc.in @@ -0,0 +1,3 @@ +# lxc misc setting +lxc.start.auto = @LXC_AUTO_START@ + diff --git a/meta-agl-lxc/recipes-container/lxc-config/lxc-config-dummy/mount.in b/meta-agl-lxc/recipes-container/lxc-config/lxc-config-dummy/mount.in new file mode 100644 index 00000000..686fdcb9 --- /dev/null +++ b/meta-agl-lxc/recipes-container/lxc-config/lxc-config-dummy/mount.in @@ -0,0 +1,7 @@ +# lxc mount setting +lxc.mount.entry = /var/lib/lxc/dummy/system.conf etc/systemd/system.conf.d/10-environment.conf none bind,optional,create=file + +lxc.mount.auto = cgroup:mixed proc:mixed sys:mixed +lxc.mount.entry = shm /dev/shm tmpfs defaults 0 0 +lxc.mount.entry = /sys/kernel/security sys/kernel/security none ro,bind,optional 0 0 + diff --git a/meta-agl-lxc/recipes-container/lxc-config/lxc-config-dummy/network.in b/meta-agl-lxc/recipes-container/lxc-config/lxc-config-dummy/network.in new file mode 100644 index 00000000..573f4796 --- /dev/null +++ b/meta-agl-lxc/recipes-container/lxc-config/lxc-config-dummy/network.in @@ -0,0 +1,3 @@ +# lxc network setting +lxc.net.0.type = empty + diff --git a/meta-agl-lxc/recipes-container/lxc-config/lxc-config-dummy/system.conf.dummy.in b/meta-agl-lxc/recipes-container/lxc-config/lxc-config-dummy/system.conf.dummy.in new file mode 100644 index 00000000..f496c589 --- /dev/null +++ b/meta-agl-lxc/recipes-container/lxc-config/lxc-config-dummy/system.conf.dummy.in @@ -0,0 +1,2 @@ +[Manager] +#DefaultEnvironment = -- cgit 1.2.3-korg