From 524e84028eccf8b2077f356efa96aba897e3e183 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 1 May 2018 21:06:46 +0300 Subject: sysvinit-inittab: do not use 'exit 1' to postpone to first boot Instead, first check if we need to do anything at all during first boot, and if so, either postpone to first boot via pkg_postinst_ontarget() when running on host, or run the necessary setup code when running on target. (From OE-Core rev: 16df1717c3813ba773e0dfa2d1db471816d8b99b) Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'meta/recipes-core/sysvinit') diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb index 5b9c422caf..8585a418ab 100644 --- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb +++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb @@ -53,8 +53,15 @@ EOF } pkg_postinst_${PN} () { +# run this on host and on target +if [ "${SERIAL_CONSOLES_CHECK}" = "" ]; then + exit 0 +fi +} + +pkg_postinst_ontarget_${PN} () { # run this on the target -if [ "x$D" = "x" ] && [ -e /proc/consoles ]; then +if [ -e /proc/consoles ]; then tmp="${SERIAL_CONSOLES_CHECK}" for i in $tmp do @@ -68,11 +75,7 @@ if [ "x$D" = "x" ] && [ -e /proc/consoles ]; then done kill -HUP 1 else - if [ "${SERIAL_CONSOLES_CHECK}" = "" ]; then - exit 0 - else - exit 1 - fi + exit 1 fi } -- cgit v1.2.3-54-g00ecf