Patchwork [2/3,V2] lsbinitscripts: Patch file functions for confirming to an lsb image

login
register
mail settings
Submitter Xiaofeng Yan
Date June 1, 2012, 9:13 a.m.
Message ID <64ceba487ad4551aaa26371fde22b7d102668dda.1338541462.git.xiaofeng.yan@windriver.com>
Download mbox | patch
Permalink /patch/29065/
State Accepted
Commit 4b829c42ffaa878537fa2005e4d80324515a5ba8
Headers show

Comments

Xiaofeng Yan - June 1, 2012, 9:13 a.m.
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>

Add the condition judgment to functions for avoiding to print error
information when system start up at first.

[YOCTO #2133]

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
 .../lsb/lsbinitscripts/functions.patch             |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-extended/lsb/lsbinitscripts/functions.patch

Patch

diff --git a/meta/recipes-extended/lsb/lsbinitscripts/functions.patch b/meta/recipes-extended/lsb/lsbinitscripts/functions.patch
new file mode 100644
index 0000000..aa63cec
--- /dev/null
+++ b/meta/recipes-extended/lsb/lsbinitscripts/functions.patch
@@ -0,0 +1,11 @@ 
+--- a/rc.d/init.d/functions	2009-12-10 05:24:11.000000000 +0800
++++ b/rc.d/init.d/functions.new	2012-06-01 16:57:12.651229387 +0800
+@@ -16,7 +16,7 @@
+ # Get a sane screen width
+ [ -z "${COLUMNS:-}" ] && COLUMNS=80
+ 
+-[ -z "${CONSOLETYPE:-}" ] && CONSOLETYPE="$(/sbin/consoletype)"
++[ -z "${CONSOLETYPE:-}" ] && [ -e /sbin/consoletype ] && CONSOLETYPE="$(/sbin/consoletype)"
+ 
+ if [ -f /etc/sysconfig/i18n -a -z "${NOLOCALE:-}" -a -z "${LANGSH_SOURCED:-}" ] ; then
+   . /etc/profile.d/lang.sh 2>/dev/null