summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/lsb/lsbinitscripts/functions.patch30
-rw-r--r--meta/recipes-extended/lsb/lsbinitscripts_9.43.bb (renamed from meta/recipes-extended/lsb/lsbinitscripts_9.03.bb)7
2 files changed, 25 insertions, 12 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 @@
1Upstream-Status: Inappropriate [configuration] 1Upstream-Status: Inappropriate [configuration]
2 2
3Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> 3Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
4--- a/rc.d/init.d/functions 2009-12-10 05:24:11.000000000 +0800 4Signed-off-by: Saul Wold <sgw@linux.intel.com>
5+++ b/rc.d/init.d/functions.new 2012-06-01 16:57:12.651229387 +0800 5
6@@ -16,7 +16,7 @@ 6Index: initscripts-9.43/rc.d/init.d/functions
7 # Get a sane screen width 7===================================================================
8 [ -z "${COLUMNS:-}" ] && COLUMNS=80 8--- initscripts-9.43.orig/rc.d/init.d/functions
9+++ initscripts-9.43/rc.d/init.d/functions
10@@ -13,6 +13,7 @@ umask 022
11 PATH="/sbin:/usr/sbin:/bin:/usr/bin"
12 export PATH
9 13
10-[ -z "${CONSOLETYPE:-}" ] && CONSOLETYPE="$(/sbin/consoletype)" 14+
11+[ -z "${CONSOLETYPE:-}" ] && [ -e /sbin/consoletype ] && CONSOLETYPE="$(/sbin/consoletype)" 15 if [ $PPID -ne 1 -a -z "$SYSTEMCTL_SKIP_REDIRECT" ] && \
16 ( /bin/mountpoint -q /cgroup/systemd || /bin/mountpoint -q /sys/fs/cgroup/systemd ) ; then
17 case "$0" in
18@@ -54,7 +55,7 @@ systemctl_redirect () {
19 [ -z "${COLUMNS:-}" ] && COLUMNS=80
12 20
13 if [ -f /etc/sysconfig/i18n -a -z "${NOLOCALE:-}" -a -z "${LANGSH_SOURCED:-}" ] ; then 21 if [ -z "${CONSOLETYPE:-}" ]; then
14 . /etc/profile.d/lang.sh 2>/dev/null 22- if [ -c "/dev/stderr" -a -r "/dev/stderr" ]; then
23+ if [ -c "/dev/stderr" -a -r "/dev/stderr" -a -e /sbin/consoletype ]; then
24 CONSOLETYPE="$(/sbin/consoletype < /dev/stderr 2>/dev/null)"
25 else
26 CONSOLETYPE="serial"
diff --git a/meta/recipes-extended/lsb/lsbinitscripts_9.03.bb b/meta/recipes-extended/lsb/lsbinitscripts_9.43.bb
index eac4ebb70f..ea8ff03b1f 100644
--- a/meta/recipes-extended/lsb/lsbinitscripts_9.03.bb
+++ b/meta/recipes-extended/lsb/lsbinitscripts_9.43.bb
@@ -7,12 +7,13 @@ PR = "r3"
7LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4e8b49780ab187d51bd26aaa022c6" 7LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4e8b49780ab187d51bd26aaa022c6"
8 8
9S="${WORKDIR}/initscripts-${PV}" 9S="${WORKDIR}/initscripts-${PV}"
10SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-${PV}.tar.bz2/668fa2762b57ef75436303857847bba3/initscripts-${PV}.tar.bz2 \ 10SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-9.43.tar.bz2/a225c9b7b0786e395b38a4d919e7d72f/initscripts-9.43.tar.bz2 \
11 file://functions.patch \ 11 file://functions.patch \
12 " 12 "
13 13
14SRC_URI[md5sum] = "668fa2762b57ef75436303857847bba3" 14SRC_URI[md5sum] = "a225c9b7b0786e395b38a4d919e7d72f"
15SRC_URI[sha256sum] = "d56547a68ce223a7413b2676650b042125f047c8d6d139c5b970e118b3dc958a" 15SRC_URI[sha256sum] = "9503c71e4f646f3fc5e7a10d5f4e6f5aea9275249fea596879b2513555d53867"
16
16inherit update-alternatives 17inherit update-alternatives
17 18
18ALTERNATIVE_PRIORITY = "100" 19ALTERNATIVE_PRIORITY = "100"