diff --git a/meta-arm-autonomy/recipes-core/sysvinit/sysvinit-inittab_2.%.bbappend b/meta-arm-autonomy/recipes-core/sysvinit/sysvinit-inittab_2.%.bbappend index 7b0c6472..e30e9648 100644 --- a/meta-arm-autonomy/recipes-core/sysvinit/sysvinit-inittab_2.%.bbappend +++ b/meta-arm-autonomy/recipes-core/sysvinit/sysvinit-inittab_2.%.bbappend @@ -1,16 +1,20 @@ -# if arm-autonomy-guest is activated, we are running as a xen guest so we must -# have a console on hvc0 -# This is normally done in meta-virtualization if xen is activated but here -# we don't have xen activated. -# +# if arm-autonomy-host or arm-autonomy-guest are activated, we need to install +# the getty-wrapper to spawn the login console on /dev/hvc0. +# This is normally done in meta-virtualization if virtualization and xen +# DISTRO_FEATURES are activated. -SYSVINIT_ADDHVC0 = "${@bb.utils.contains('DISTRO_FEATURES', \ - 'arm-autonomy-guest', 'true', 'false', d)}" +# In both arm-autonomy-host and arm-autonomy-guest we don't have virtualization +# in DISTRO_FEATURE. Hence, manually include sysvinit-inittab_virtualization.inc +# to install the getty-wrapper. +require ${@bb.utils.contains_any('DISTRO_FEATURES', \ + 'arm-autonomy-host arm-autonomy-guest', \ + 'recipes-core/sysvinit/sysvinit-inittab_virtualization.inc', \ + '', d)} -do_install_append() { - if ${SYSVINIT_ADDHVC0}; then - echo "" >> ${D}${sysconfdir}/inittab - echo "X0:12345:respawn:/sbin/getty 115200 hvc0" >> \ - ${D}${sysconfdir}/inittab - fi -} +# For arm-autonomy-guest we don't have xen in DISTRO_FEATURES. Hence, manually +# include sysvinit-inittab_xen.inc to append the getty-wrapper entry to +# /etc/inittab. +require ${@bb.utils.contains('DISTRO_FEATURES', \ + 'arm-autonomy-guest', \ + 'recipes-core/sysvinit/sysvinit-inittab_xen.inc', \ + '', d)}