From 90fef036fe465262d5915489d45f430b313f22ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Sat, 8 Apr 2023 18:18:55 +0200 Subject: [PATCH] lxc: set RUNTIME_PATH define to the /var/run path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The default runtime directory used by LXC is /run which doesn't exist in OpenWrt. It causes errors like: Failed to create lock for foo lxc-create: foo: tools/lxc_create.c: main: 260 Failed to create lxc container There has been workaround for that in the lxc-auto.init but it requires installing "lxc-auto" package. Replacing that "ln -s" workaround with Makefile specifying RUNTIME_PATH define allows using pure "lxc" in OpenWrt (without the "lxc-auto"). Signed-off-by: Rafał Miłecki --- utils/lxc/Makefile | 5 +++-- utils/lxc/files/lxc-auto.init | 4 ---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/utils/lxc/Makefile b/utils/lxc/Makefile index 15ebd3001a..dcb2a79e16 100644 --- a/utils/lxc/Makefile +++ b/utils/lxc/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lxc PKG_VERSION:=5.0.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://linuxcontainers.org/downloads/lxc/ @@ -33,7 +33,8 @@ MESON_ARGS += \ -Dselinux=false \ -Dseccomp=$(if $(CONFIG_LXC_SECCOMP),true,false) \ -Dexamples=false \ - -Db_pie=true + -Db_pie=true \ + -Druntime-path=/var/run LXC_APPLETS_BIN += \ attach autostart cgroup copy config console create destroy device \ diff --git a/utils/lxc/files/lxc-auto.init b/utils/lxc/files/lxc-auto.init index 4983c59196..14fe2c509b 100755 --- a/utils/lxc/files/lxc-auto.init +++ b/utils/lxc/files/lxc-auto.init @@ -69,9 +69,5 @@ boot() { mount -t cgroup -o rw,nosuid,nodev,noexec,relatime,none,name=systemd cgroup /sys/fs/cgroup/systemd fi - if [ ! -d /run ]; then - ln -s /var/run /run - fi - start }