diff options
Diffstat (limited to 'meta/recipes-extended/lsb/lsbinitscripts/functions.patch')
| -rw-r--r-- | meta/recipes-extended/lsb/lsbinitscripts/functions.patch | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/meta/recipes-extended/lsb/lsbinitscripts/functions.patch b/meta/recipes-extended/lsb/lsbinitscripts/functions.patch index 6d09d05427..a756d047ef 100644 --- a/meta/recipes-extended/lsb/lsbinitscripts/functions.patch +++ b/meta/recipes-extended/lsb/lsbinitscripts/functions.patch @@ -1,14 +1,26 @@ Upstream-Status: Inappropriate [configuration] Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> ---- 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 +Signed-off-by: Saul Wold <sgw@linux.intel.com> + +Index: initscripts-9.43/rc.d/init.d/functions +=================================================================== +--- initscripts-9.43.orig/rc.d/init.d/functions ++++ initscripts-9.43/rc.d/init.d/functions +@@ -13,6 +13,7 @@ umask 022 + PATH="/sbin:/usr/sbin:/bin:/usr/bin" + export PATH --[ -z "${CONSOLETYPE:-}" ] && CONSOLETYPE="$(/sbin/consoletype)" -+[ -z "${CONSOLETYPE:-}" ] && [ -e /sbin/consoletype ] && CONSOLETYPE="$(/sbin/consoletype)" ++ + if [ $PPID -ne 1 -a -z "$SYSTEMCTL_SKIP_REDIRECT" ] && \ + ( /bin/mountpoint -q /cgroup/systemd || /bin/mountpoint -q /sys/fs/cgroup/systemd ) ; then + case "$0" in +@@ -54,7 +55,7 @@ systemctl_redirect () { + [ -z "${COLUMNS:-}" ] && COLUMNS=80 - if [ -f /etc/sysconfig/i18n -a -z "${NOLOCALE:-}" -a -z "${LANGSH_SOURCED:-}" ] ; then - . /etc/profile.d/lang.sh 2>/dev/null + if [ -z "${CONSOLETYPE:-}" ]; then +- if [ -c "/dev/stderr" -a -r "/dev/stderr" ]; then ++ if [ -c "/dev/stderr" -a -r "/dev/stderr" -a -e /sbin/consoletype ]; then + CONSOLETYPE="$(/sbin/consoletype < /dev/stderr 2>/dev/null)" + else + CONSOLETYPE="serial" |