From e1f03d7ee4493e4541eb3a985faa8bae31c541f2 Mon Sep 17 00:00:00 2001 From: Glen Huang Date: Fri, 3 Mar 2023 11:08:32 +0800 Subject: [PATCH] acme: fix incompatibilty with image builder Signed-off-by: Glen Huang --- net/acme-common/Makefile | 10 +++++++--- net/acme-common/files/acme.init | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/net/acme-common/Makefile b/net/acme-common/Makefile index 49e5f76f7..841146826 100644 --- a/net/acme-common/Makefile +++ b/net/acme-common/Makefile @@ -50,13 +50,17 @@ endef define Package/acme-common/postinst #!/bin/sh -grep -q '/etc/init.d/acme' /etc/crontabs/root 2>/dev/null && exit 0 -echo "0 0 * * * /etc/init.d/acme start" >> /etc/crontabs/root +if [ -z "$$IPKG_INSTROOT" ]; then + grep -q '/etc/init.d/acme' /etc/crontabs/root 2>/dev/null && exit 0 + echo "0 0 * * * /etc/init.d/acme start" >> /etc/crontabs/root +fi endef define Package/acme-common/prerm #!/bin/sh -sed -i '\|/etc/init.d/acme|d' /etc/crontabs/root +if [ -z "$$IPKG_INSTROOT" ]; then + sed -i '\|/etc/init.d/acme|d' /etc/crontabs/root +fi endef define Build/Configure diff --git a/net/acme-common/files/acme.init b/net/acme-common/files/acme.init index 1bca639f4..a97856496 100644 --- a/net/acme-common/files/acme.init +++ b/net/acme-common/files/acme.init @@ -9,7 +9,7 @@ HOOK=/usr/lib/acme/hook LOG_TAG=acme # shellcheck source=net/acme/files/functions.sh -. /usr/lib/acme/functions.sh +. "$IPKG_INSTROOT/usr/lib/acme/functions.sh" cleanup() { log debug "cleaning up"