[oe-commits] [openembedded-core] 08/61: busybox: Fix busybox-init on non-tty consoles

[git at git.openembedded.org]

rpurdie pushed a commit to branch krogoth
in repository openembedded-core.

commit 3c5097574e24a3923b093d8ef92506411dc8df08
Author: Stefan Agner <stefan at agner.ch>
AuthorDate: Sun Aug 7 22:47:28 2016 -0700

    busybox: Fix busybox-init on non-tty consoles
    
    When using non-tty consoles (e.g. VirtIO console /dev/hvc0) the
    current init system fails with:
    process '/sbin/getty 115200 hvc0' (pid 545) exited. Scheduling for restart.
    can't open /dev/ttyhvc0: No such file or directory
    
    The first field needs to be a valid device. The BusyBox inittab example
    explains as follows:
    "<id>: WARNING: This field has a non-traditional meaning for BusyBox init!
    
    The id field is used by BusyBox init to specify the controlling tty for
    the specified process to run on.  The contents of this field are
    appended to "/dev/" and used as-is."
    
    (From OE-Core rev: a53393082f331a613cb3eb973a07bab22cefcde8)
    
    Signed-off-by: Stefan Agner <stefan at agner.ch>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta/recipes-core/busybox/busybox.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 5e91a26..39c2eef 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -286,8 +286,8 @@ do_install () {
                         for i in $tmp
                         do
                                 j=`echo ${i} | sed s/\;/\ /g`
-                                label=`echo ${i} | sed -e 's/tty//' -e 's/^.*;//' -e 's/;.*//'`
-                                echo "tty$label::respawn:${base_sbindir}/getty ${j}" >> ${D}${sysconfdir}/inittab
+                                id=`echo ${i} | sed -e 's/^.*;//' -e 's/;.*//'`
+                                echo "$id::respawn:${base_sbindir}/getty ${j}" >> ${D}${sysconfdir}/inittab
                         done
                 fi
         fi

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.