[oe-commits] Ross Burton : systemd: pass --root in prerm if running on host

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: d01da862d10d9544f8da846b577cf955041d4c0c
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=d01da862d10d9544f8da846b577cf955041d4c0c

Author: Ross Burton <ross.burton at intel.com>
Date:   Wed Dec 18 16:20:06 2013 +0000

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.

Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 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
 }