diff options
| author | Ross Burton <ross.burton@intel.com> | 2013-12-18 16:20:06 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-18 17:08:06 +0000 |
| commit | 402308cfe2ef7777342c2af807b494ac921e81d6 (patch) | |
| tree | b1324038d1d2a7e9703dfe41d38fcfb174d23a4f /meta/classes | |
| parent | 3d2c33cd3d025366e5906313904c72608c1ee71f (diff) | |
| download | ast2050-yocto-poky-402308cfe2ef7777342c2af807b494ac921e81d6.zip ast2050-yocto-poky-402308cfe2ef7777342c2af807b494ac921e81d6.tar.gz | |
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 <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/systemd.bbclass | 8 |
1 files changed, 7 insertions, 1 deletions
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 } |
