diff options
Diffstat (limited to 'yocto-poky/meta/recipes-extended/lsb/lsbinitscripts')
2 files changed, 49 insertions, 0 deletions
diff --git a/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch b/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch new file mode 100644 index 000000000..0809c9be9 --- /dev/null +++ b/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch @@ -0,0 +1,23 @@ +Upstream-Status: Pending + +Subject: functions: avoid exit 1 which causes init scripts to fail + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + rc.d/init.d/functions | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions +index 6850046..11223f7 100644 +--- a/rc.d/init.d/functions ++++ b/rc.d/init.d/functions +@@ -597,5 +597,5 @@ if [ "$_use_systemctl" = "1" ]; then + fi + fi + +-strstr "$(cat /proc/cmdline)" "rc.debug" && set -x ++strstr "$(cat /proc/cmdline)" "rc.debug" && set -x || true + +-- +2.1.0 + diff --git a/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts/functions.patch b/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts/functions.patch new file mode 100644 index 000000000..a756d047e --- /dev/null +++ b/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts/functions.patch @@ -0,0 +1,26 @@ +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> +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 + + 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" |