summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2022-05-18 13:46:01 +0300
committerJosef Schlehofer <pepe.schlehofer@gmail.com>2022-06-24 12:20:43 +0200
commitcf0d586c7ff5f1f5ea6582aa7da6416d8d026c01 (patch)
tree9920b8d0e8597b625e2818325df899264ee92239
parent70b0ff8a4844948b556be20bcb682eb320b66825 (diff)
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 <stijn@linux-ipv6.be>
-rw-r--r--utils/lxc/Makefile4
1 files changed, 0 insertions, 4 deletions
diff --git a/utils/lxc/Makefile b/utils/lxc/Makefile
index 417a24f5b..4a55ec097 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