summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-04-24 15:33:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-10 12:31:14 +0100
commit1633edffc7c0e2f85efd93a502bbacf055aee8b5 (patch)
tree3a36f1722a3974b54705383ee98c0639b6e8e372
parentf5bfb120dd4313ed82db4d8416835fec860f9bee (diff)
downloadpoky-1633edffc7c0e2f85efd93a502bbacf055aee8b5.tar.gz
sysvinit-inittab: ensure unique label for SERIAL_CONSOLES entries
The label field in /etc/inittab entries needs to be unique, and the numeric label being used for the SERIAL_CONSOLES getty entries was clashing with the entries added for standard ttyX entries added via SYSVINIT_ENABLED_GETTYS. Use the part after "tty" in the device name (which is what the comment further down explicitly says should be done) as the label rather than a simple incrementing number. Fixes [YOCTO #4374]. (From OE-Core rev: 28d3202befcec72554885f8ea9cb7985523b89f5) (From OE-Core rev: d3393e28c5d6aa8a8bab754574ec68e540269a1c) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb6
1 files changed, 2 insertions, 4 deletions
diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
index b28985314f..fbac8937fe 100644
--- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
+++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
@@ -21,14 +21,12 @@ do_install() {
21 echo "S:2345:respawn:${base_sbindir}/getty ${SERIAL_CONSOLE}" >> ${D}${sysconfdir}/inittab 21 echo "S:2345:respawn:${base_sbindir}/getty ${SERIAL_CONSOLE}" >> ${D}${sysconfdir}/inittab
22 fi 22 fi
23 23
24 idx=0
25 tmp="${SERIAL_CONSOLES}" 24 tmp="${SERIAL_CONSOLES}"
26 for i in $tmp 25 for i in $tmp
27 do 26 do
28 j=`echo ${i} | sed s/\;/\ /g` 27 j=`echo ${i} | sed s/\;/\ /g`
29 echo "${idx}:12345:respawn:${base_sbindir}/getty ${j}" >> ${D}${sysconfdir}/inittab 28 label=`echo ${i} | sed -e 's/^.*;tty//'`
30 29 echo "$label:12345:respawn:${base_sbindir}/getty ${j}" >> ${D}${sysconfdir}/inittab
31 idx=`expr $idx + 1`
32 done 30 done
33 31
34 if [ "${USE_VT}" = "1" ]; then 32 if [ "${USE_VT}" = "1" ]; then