diff options
| author | Ming Liu <liu.ming50@gmail.com> | 2017-11-20 15:37:31 +0800 |
|---|---|---|
| committer | Laurent Bonnans <laurent.bonnans@here.com> | 2018-05-15 10:48:54 +0200 |
| commit | b11ddfbc56721ccc2836c6994678acb3e1b5ca74 (patch) | |
| tree | 213a8e33c8bb5cd654046d22b3ac49a1e00578a5 | |
| parent | 41c2df71f443047ea6d6adb988f17eb493f10f89 (diff) | |
| download | meta-updater-b11ddfbc56721ccc2836c6994678acb3e1b5ca74.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 9e3bc6f..777360f 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
| @@ -16,7 +16,7 @@ RAMDISK_EXT_arm ?= ".ext4.gz.u-boot" | |||
| 16 | 16 | ||
| 17 | OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}" | 17 | OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}" |
| 18 | 18 | ||
| 19 | export SYSTEMD_USED = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', '', d)}" | 19 | export SYSTEMD_USED = "${@oe.utils.ifelse(d.getVar('VIRTUAL-RUNTIME_init_manager', True) == 'systemd', 'true', '')}" |
| 20 | 20 | ||
| 21 | IMAGE_CMD_ostree () { | 21 | IMAGE_CMD_ostree () { |
| 22 | if [ -z "$OSTREE_REPO" ]; then | 22 | if [ -z "$OSTREE_REPO" ]; then |