[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3770/8267] sysvinit-inittab: fix getty device removal



commit 2f0eb8e1b67b2f9fa7d07060a28f25ae5cad02e2
Author: Leonardo Sandoval <leonardo sandoval gonzalez linux intel com>
Date:   Tue Nov 29 15:56:52 2016 -0600

    sysvinit-inittab: fix getty device removal
    
    getty devices were not being removed in some cases because device name
    was not at the end of the line, for example a ttyS1 device:
    
    S1:12345:respawn:/bin/start_getty 115200 ttyS1 vt102
    
    Removing this limitation allows sed to remove any line containing
    the device.
    
    (From OE-Core rev: 2e0b36981c1f91ed0d3d457c370df10a099407af)
    
    Signed-off-by: Leonardo Sandoval <leonardo sandoval gonzalez linux intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../sysvinit/sysvinit-inittab_2.88dsf.bb           |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb 
b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
index c219cbf..5b9c422 100644
--- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
+++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
@@ -62,7 +62,7 @@ if [ "x$D" = "x" ] && [ -e /proc/consoles ]; then
                k=`echo ${i} | sed s/^.*\://g`
                if [ -z "`grep ${j} /proc/consoles`" ]; then
                        if [ -z "${k}" ] || [ -z "`grep ${k} /proc/consoles`" ] || [ ! -e /dev/${j} ]; then
-                               sed -i /^.*${j}$/d /etc/inittab
+                               sed -i -e /^.*${j}\ /d -e /^.*${j}$/d /etc/inittab
                        fi
                fi
        done


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]