From 76751a03b1475f22499c488395274453096b9c38 Mon Sep 17 00:00:00 2001 From: Jacob Kroon Date: Sun, 27 Oct 2013 10:20:29 +0100 Subject: update-rc.d.bbclass: Fix host/target test in postinst MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When running the postinst script I get a shell warning: sh: argument expected and the service is never stopped. This patch fixes the warning message and stops the service. Patch v2: Hans Beckérus pointed out that the patch is not correct. This version uses the syntax proposed by Hans. I've tested that the postinst script works correctly when run on the target, both when the init script exists and when it doesn't exist. (From OE-Core rev: 7e23557835f756b22b95fa7a1926b5d1d21872c3) Signed-off-by: Jacob Kroon Signed-off-by: Richard Purdie --- meta/classes/update-rc.d.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass index e14659d118..9437e9cc31 100644 --- a/meta/classes/update-rc.d.bbclass +++ b/meta/classes/update-rc.d.bbclass @@ -16,7 +16,7 @@ updatercd_postinst() { # test if there is a previous init script there, ie, we are updating the package # if so, we stop the service and remove it before we install from the new package if type update-rc.d >/dev/null 2>/dev/null; then - if [ -z "$D" -a `test -f "${INIT_D_DIR}/${INITSCRIPT_NAME}"` ]; then + if [ -z "$D" -a -f "${INIT_D_DIR}/${INITSCRIPT_NAME}" ]; then ${INIT_D_DIR}/${INITSCRIPT_NAME} stop fi if [ -n "$D" ]; then -- cgit v1.2.3-54-g00ecf