From c152bca6461c72d527af8f38545d8a0bc2324747 Mon Sep 17 00:00:00 2001 From: Naoto Yamaguchi Date: Sun, 1 Dec 2024 15:30:31 +0900 Subject: Remove integration type without container manager from container integration Existing container integration was supporing with container-manager and without container-manager integration. After the scarthgap update, systemd cgroup-v1 and v2 mixed support was disabled. It require to big rework in resource controle feature. The lxc only integration (without container-manager integration) has some limitation for device support. For example, it can't handle dynamic device/network interface change, it' can't protect device access from guest using mknod. On the other hand, if I mantain to this integration, it need many human resource. The lxc only integration does not have value for these work. This change drop lxc only integration. This strategy was discussed in gerrit 30506. Bug-AGL: SPEC-5283 Change-Id: I66b209cdf7fa6bf77439a24211de4da7dcdfa873 Signed-off-by: Naoto Yamaguchi --- .../lxc-config/lxc-config-cluster-demo/basic.in | 9 --------- .../lxc-config/lxc-config-cluster-demo/environment.in | 7 ------- .../lxc-config/lxc-config-cluster-demo/misc.in | 3 --- .../lxc-config/lxc-config-cluster-demo/mount.in | 14 -------------- .../lxc-config/lxc-config-cluster-demo/network.in | 3 --- .../lxc-config-cluster-demo/system.conf.cluster-demo.in | 2 -- 6 files changed, 38 deletions(-) delete mode 100644 meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/basic.in delete mode 100644 meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/environment.in delete mode 100644 meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/misc.in delete mode 100644 meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/mount.in delete mode 100644 meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/network.in delete mode 100644 meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/system.conf.cluster-demo.in (limited to 'meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo') diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/basic.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/basic.in deleted file mode 100644 index 22a8f8de..00000000 --- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/basic.in +++ /dev/null @@ -1,9 +0,0 @@ -# lxc basic setting -lxc.rootfs.path = dir:/var/lib/machines/cluster-demo -lxc.signal.halt = SIGRTMIN+3 -lxc.signal.reboot = SIGTERM -lxc.uts.name = "cluster" -lxc.tty.max = 1 -lxc.pty.max = 1 -lxc.cap.drop = sys_module mac_admin mac_override sys_time - diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/environment.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/environment.in deleted file mode 100644 index 374b9c03..00000000 --- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/environment.in +++ /dev/null @@ -1,7 +0,0 @@ -# lxc environment variable setting -lxc.environment = QT_QPA_PLATFORM=wayland -lxc.environment = QT_QPA_PLATFORM_PLUGIN_PATH=/usr/lib/plugins/ -lxc.environment = QML_IMPORT_PATH=/usr/lib/qml/ -lxc.environment = QML2_IMPORT_PATH=/usr/lib/qml/ -lxc.environment = QT_WAYLAND_SHELL_INTEGRATION=xdg-shell - diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/misc.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/misc.in deleted file mode 100644 index 9b4f4883..00000000 --- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/misc.in +++ /dev/null @@ -1,3 +0,0 @@ -# lxc misc setting -lxc.start.auto = @LXC_AUTO_START@ - diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/mount.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/mount.in deleted file mode 100644 index a87322ba..00000000 --- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/mount.in +++ /dev/null @@ -1,14 +0,0 @@ -# lxc mount setting -lxc.mount.entry = /var/lib/lxc/cluster-demo/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 - -lxc.cgroup.devices.allow = c 226:* rwm -lxc.mount.entry = /dev/dri dev/dri none bind,optional,create=dir - -lxc.mount.entry = /run/drm-lease-manager/lease-cluster var/display/drm-lease-manager/lease none bind,create=file - -lxc.mount.entry = /run/pipewire/icipc-0 var/icipc-0 none bind,optional,create=file - diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/network.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/network.in deleted file mode 100644 index 573f4796..00000000 --- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/network.in +++ /dev/null @@ -1,3 +0,0 @@ -# lxc network setting -lxc.net.0.type = empty - diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/system.conf.cluster-demo.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/system.conf.cluster-demo.in deleted file mode 100644 index f496c589..00000000 --- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/system.conf.cluster-demo.in +++ /dev/null @@ -1,2 +0,0 @@ -[Manager] -#DefaultEnvironment = -- cgit 1.2.3-korg