From 44d96752c463a85b7ab6a67e35b4667a22f8165f Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 18 Dec 2013 16:20:06 +0000 Subject: [PATCH] systemd: pass --root in prerm if running on host If a systemd image is built without a package manager then packages will be removed from an image during rootfs generation, but without passing --root the systemctl will look on the *host* system. (From OE-Core rev: d01da862d10d9544f8da846b577cf955041d4c0c) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/systemd.bbclass | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass index efc1adc..2bd63a4 100644 --- a/meta/classes/systemd.bbclass +++ b/meta/classes/systemd.bbclass @@ -38,12 +38,18 @@ fi } systemd_prerm() { +OPTS="" + +if [ -n "$D" ]; then + OPTS="--root=$D" +fi + if type systemctl >/dev/null 2>/dev/null; then if [ -z "$D" ]; then systemctl stop ${SYSTEMD_SERVICE} fi - systemctl disable ${SYSTEMD_SERVICE} + systemctl $OPTS disable ${SYSTEMD_SERVICE} fi } -- 2.7.4