[gnome-continuous-yocto/gnomeostree-3.22-krogoth: 24/246] busybox: Fix busybox-init on non-tty consoles

[Emmanuele Bassi <ebassi src gnome org>]

commit d9d046c28ab1c221313162c3f8115e608c480771
Author: Stefan Agner <stefan agner ch>
Date:   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)
    
    (From OE-Core rev: 3c5097574e24a3923b093d8ef92506411dc8df08)
    
    Signed-off-by: Stefan Agner <stefan agner ch>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
    Signed-off-by: Armin Kuster <akuster808 gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-core/busybox/busybox.inc |    4 ++--
 1 files 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