Browse Source

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 2cde10b950.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
(cherry picked from commit 039912dec5)
lilik-openwrt-22.03
Stijn Tintel 2 years ago
committed by Josef Schlehofer
parent
commit
6c942ec7fb
No known key found for this signature in database GPG Key ID: B950216FE4329F4C
1 changed files with 0 additions and 4 deletions
  1. +0
    -4
      utils/lxc/Makefile

+ 0
- 4
utils/lxc/Makefile View File

@ -181,10 +181,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


Loading…
Cancel
Save