diff options
| author | Ming Liu <liu.ming50@gmail.com> | 2017-11-20 15:37:31 +0800 |
|---|---|---|
| committer | Ming Liu <liu.ming50@gmail.com> | 2017-11-20 15:37:31 +0800 |
| commit | 66c0d3afa91d2683728065a0b00de43ad25c3d6f (patch) | |
| tree | c489312bdfaf46a14301c67ccdcfcf4c5ac96e80 | |
| parent | daa6f7201a8450556f526e15a9bd3395eb85ed29 (diff) | |
| download | meta-updater-66c0d3afa91d2683728065a0b00de43ad25c3d6f.tar.gz | |
image_types_ostree.bbclass: change the systemd detecting logic
It can not determine the init manager is systemd by checking if
DISTRO_FEATURES contains 'systemd', change it to check
VIRTUAL-RUNTIME_init_manager instead.
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
| -rw-r--r-- | classes/image_types_ostree.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index 8143b67..ba09ab7 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
| @@ -15,7 +15,7 @@ RAMDISK_EXT_arm ?= ".ext4.gz.u-boot" | |||
| 15 | 15 | ||
| 16 | OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}" | 16 | OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}" |
| 17 | 17 | ||
| 18 | export SYSTEMD_USED = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', '', d)}" | 18 | export SYSTEMD_USED = "${@oe.utils.ifelse(d.getVar('VIRTUAL-RUNTIME_init_manager', True) == 'systemd', 'true', '')}" |
| 19 | 19 | ||
| 20 | IMAGE_CMD_ostree () { | 20 | IMAGE_CMD_ostree () { |
| 21 | if [ -z "$OSTREE_REPO" ]; then | 21 | if [ -z "$OSTREE_REPO" ]; then |