From cf0d586c7ff5f1f5ea6582aa7da6416d8d026c01 Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Wed, 18 May 2022 13:46:01 +0300 Subject: [PATCH] Revert "lxc: export systemd cgroups after install" The postinst script is sourced during image build, which causes the follow failure: /home/stijn/Development/OpenWrt/openwrt/build_dir/target-x86_64_musl/root-x86/etc/init.d/lxc-auto: line 3: /lib/functions.sh: No such file or directory postinst script ./usr/lib/opkg/info/lxc-auto.postinst has failed with exit code 1 Sourcing /lib/functions.sh is not needed, as /etc/rc.common does so already. Unfortunately removing that line from the init script is not enough to fix the problem. The postinst script should also check IPKG_INSTROOT. As these two changes are unrelated, they should go in separate commits, and the solution to the image build problem is to revert the commit that introduced the breakage. This reverts commit 2cde10b95053bf958a4001fb0a82c4563bf345e2. Signed-off-by: Stijn Tintel --- utils/lxc/Makefile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/utils/lxc/Makefile b/utils/lxc/Makefile index 417a24f5b1..4a55ec0970 100644 --- a/utils/lxc/Makefile +++ b/utils/lxc/Makefile @@ -193,10 +193,6 @@ define Package/lxc-auto/install $(INSTALL_BIN) ./files/lxc-auto.init $(1)/etc/init.d/lxc-auto endef -define Package/lxc-auto/postinst -[ "$${PKG_UPGRADE}" = "0" ] && /etc/init.d/lxc-auto boot -endef - define Package/lxc-common/conffiles /etc/lxc/default.conf /etc/lxc/lxc.conf -- 2.30.2