diff options
author | Choong YinThong <yin.thong.choong@intel.com> | 2017-04-13 17:26:39 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-03 23:46:06 +0100 |
commit | 65dfeb248ba0209fb6b6966e28cb28f1b063fdda (patch) | |
tree | 6d4983dba48763de3316af55ec96de5a3fd60674 | |
parent | 2e09dc1be72e02c8e0bd80d06c18becd78717dd2 (diff) | |
download | poky-65dfeb248ba0209fb6b6966e28cb28f1b063fdda.tar.gz |
start_getty: Over added SERIAL_CONSOLE cause error in userspace log
Error log will be logged into /var/log/message.
Added in more condition checking on the script. Check
/proc/tty/drivers and /proc/tty/driver/*
file system to retrieve active targeted serial.
Only establish getty with active serial in runtime.
[YOCTO #10844]
Reviewed-by: Saul Wold <sgw@linux.intel.com>
(From OE-Core rev: ac0e9541fe93e866e42914f65a0516b993f0cffe)
Signed-off-by: Choong YinThong <yin.thong.choong@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/sysvinit/sysvinit-inittab/start_getty | 38 |
1 files changed, 34 insertions, 4 deletions
diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab/start_getty b/meta/recipes-core/sysvinit/sysvinit-inittab/start_getty index e3d052a840..31b4413433 100644 --- a/meta/recipes-core/sysvinit/sysvinit-inittab/start_getty +++ b/meta/recipes-core/sysvinit/sysvinit-inittab/start_getty | |||
@@ -1,5 +1,35 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | if [ -c /dev/$2 ] | 2 | #################################################################################### |
3 | then | 3 | # This script is use to automatic start serial console once power up. |
4 | /sbin/getty -L $1 $2 $3 | 4 | # Script enhancement has been done base on Bug YOCTO 10844. |
5 | fi | 5 | # Configuration can be done in meta/conf/machine/*.conf variable SERIAL_CONSOLES. |
6 | # Most of the information is retrieve from /proc virtual filesystem which | ||
7 | # contain all the runtime system information (eg. system memory, device mount, etc). | ||
8 | #################################################################################### | ||
9 | |||
10 | # Get active serial filename. | ||
11 | active_serial=$(grep "serial" /proc/tty/drivers | grep -oh "^\s*\S*") | ||
12 | |||
13 | # Re-phrase input parameter from ttyS target index (ttyS1, ttyS2, ttyAMA0, etc). | ||
14 | runtime_tty=$(echo $2 | grep -oh '[0-9]') | ||
15 | |||
16 | for line in $active_serial; do | ||
17 | # File is availability, file content current active serial target index. | ||
18 | if [ -e /proc/tty/driver/$line ] | ||
19 | then | ||
20 | # File content a lot of unknown serial. We use -v to remove all unmatch and get left off. | ||
21 | # Tail use to avoid 1st line included into the filter because 1st line is file description. | ||
22 | activetty=$(grep -v "unknown" /proc/tty/driver/$line | tail -n +2 | grep -oh "^\s*\S*[0-9]") | ||
23 | for active in $activetty; do | ||
24 | # Check if both index is match then proceed to enable the serial console. | ||
25 | if [ $active -eq $runtime_tty ] | ||
26 | then | ||
27 | if [ -c /dev/$2 ] | ||
28 | then | ||
29 | /sbin/getty -L $1 $2 $3 | ||
30 | fi | ||
31 | break | ||
32 | fi | ||
33 | done | ||
34 | fi | ||
35 | done | ||