Revert "lxc: export systemd cgroups after install"
authorStijn Tintel <stijn@linux-ipv6.be>
Wed, 18 May 2022 10:46:01 +0000 (13:46 +0300)
committerJosef Schlehofer <pepe.schlehofer@gmail.com>
Fri, 24 Jun 2022 10:20:43 +0000 (12:20 +0200)
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>
utils/lxc/Makefile

index 417a24f5b18a1fd8c8caf944099d3d3f79a31a44..4a55ec09707aa4ceaecbfef3674d162cc4fe3bcb 100644 (file)
@@ -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