sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

lsbinitscripts: update to 9.43 

(From OE-Core rev: a4a82b2ad55e2671cd1068727058754fe417f4f0)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Saul Wold 2012-12-13 19:04:58 -08:00 committed by Richard Purdie
parent 690265b3e6
commit 756d84ad64
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
meta/recipes-extended/lsb/lsbinitscripts/functions.patch
View File

@ -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
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
+
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
-[ -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
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"

7
meta/recipes-extended/lsb/lsbinitscripts_9.03.bb → meta/recipes-extended/lsb/lsbinitscripts_9.43.bb
View File

@ -7,12 +7,13 @@ PR = "r3"
LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4e8b49780ab187d51bd26aaa022c6"
S="${WORKDIR}/initscripts-${PV}"
SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-${PV}.tar.bz2/668fa2762b57ef75436303857847bba3/initscripts-${PV}.tar.bz2 \
SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-9.43.tar.bz2/a225c9b7b0786e395b38a4d919e7d72f/initscripts-9.43.tar.bz2 \
file://functions.patch \
"
SRC_URI[md5sum] = "668fa2762b57ef75436303857847bba3"
SRC_URI[sha256sum] = "d56547a68ce223a7413b2676650b042125f047c8d6d139c5b970e118b3dc958a"
SRC_URI[md5sum] = "a225c9b7b0786e395b38a4d919e7d72f"
SRC_URI[sha256sum] = "9503c71e4f646f3fc5e7a10d5f4e6f5aea9275249fea596879b2513555d53867"
inherit update-alternatives
ALTERNATIVE_PRIORITY = "100"