diff options
| author | Xiaofeng Yan <xiaofeng.yan@windriver.com> | 2012-05-28 15:38:32 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-05 22:56:31 +0100 |
| commit | 6e416742ff131265a2471423bf5bf47e2fc4df3e (patch) | |
| tree | e5fcf29212827265e5983bb1db4932d56aa76a09 /meta/recipes-extended/lsb/lsbinitscripts | |
| parent | d32f9004f81d05c94f92a980285a70f49d9b3919 (diff) | |
| download | poky-6e416742ff131265a2471423bf5bf47e2fc4df3e.tar.gz | |
lsbinitscripts: Patch file functions for confirming to an lsb image
Add the condition judgment to functions for avoiding to print error
information when system start up at first.
[YOCTO #2133]
(From OE-Core rev: 4b829c42ffaa878537fa2005e4d80324515a5ba8)
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/lsb/lsbinitscripts')
| -rw-r--r-- | meta/recipes-extended/lsb/lsbinitscripts/functions.patch | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/meta/recipes-extended/lsb/lsbinitscripts/functions.patch b/meta/recipes-extended/lsb/lsbinitscripts/functions.patch new file mode 100644 index 0000000000..aa63cec8ba --- /dev/null +++ b/meta/recipes-extended/lsb/lsbinitscripts/functions.patch | |||
| @@ -0,0 +1,11 @@ | |||
| 1 | --- a/rc.d/init.d/functions 2009-12-10 05:24:11.000000000 +0800 | ||
| 2 | +++ b/rc.d/init.d/functions.new 2012-06-01 16:57:12.651229387 +0800 | ||
| 3 | @@ -16,7 +16,7 @@ | ||
| 4 | # Get a sane screen width | ||
| 5 | [ -z "${COLUMNS:-}" ] && COLUMNS=80 | ||
| 6 | |||
| 7 | -[ -z "${CONSOLETYPE:-}" ] && CONSOLETYPE="$(/sbin/consoletype)" | ||
| 8 | +[ -z "${CONSOLETYPE:-}" ] && [ -e /sbin/consoletype ] && CONSOLETYPE="$(/sbin/consoletype)" | ||
| 9 | |||
| 10 | if [ -f /etc/sysconfig/i18n -a -z "${NOLOCALE:-}" -a -z "${LANGSH_SOURCED:-}" ] ; then | ||
| 11 | . /etc/profile.d/lang.sh 2>/dev/null | ||