- drop fedora/redhat "comaptibility", breaks screen handling with bash

[packages/rc-scripts.git] / rc-scripts-sh_fixes.patch

diff --git a/rc-scripts-sh_fixes.patch b/rc-scripts-sh_fixes.patch
index 4827cdec2e51ce8572e423bb086a6538b4d9d324..7a1eddf831da1f1495e472d27050d18ce373dcd0 100644 (file)
--- a/rc-scripts-sh_fixes.patch
+++ b/rc-scripts-sh_fixes.patch
@@ -1,3 +1,69 @@
+diff -ur rc-scripts-0.4.11.orig/lib/functions rc-scripts-0.4.11/lib/functions
+--- rc-scripts-0.4.11.orig/lib/functions       2014-03-20 19:25:43.000000000 +0000
++++ rc-scripts-0.4.11/lib/functions    2014-05-17 12:57:04.495000084 +0000
+@@ -61,17 +61,6 @@
+ [ -r /etc/sysconfig/system ] && . /etc/sysconfig/system
+ [ -r /etc/sysconfig/bootsplash ] && . /etc/sysconfig/bootsplash
+ 
+-# if initscript is invoked via bash, enable RedHat/Fedora compatibility
+-# RC_FEDORA is "set" if enabled and "unset" when not, but it's "value" is always empty
+-# this is useful for inline constructs
+-if [ "${BASH_VERSION+set}" = "set" ]; then
+-      RC_LOGGING=yes
+-      FASTRC=no
+-      RC_FEDORA=
+-else
+-      unset RC_FEDORA || :
+-fi
+-
+ [ "$env_upstart" ] && USE_UPSTART=$env_upstart
+ 
+ if [ -z "$VSERVER" -o "$VSERVER" = "detect" ]; then
+@@ -472,7 +461,7 @@
+ }
+ 
+ ok() {
+-      echo -ne "$_ok${RC_FEDORA+\\r}${RC_FEDORA-\\n}"
++      echo "$_ok"
+ }
+ 
+ started() {
+@@ -480,7 +469,7 @@
+ }
+ 
+ fail() {
+-      echo -ne "$_fail${RC_FEDORA+\\r}${RC_FEDORA-\\n}"
++      echo "$_fail"
+       return 1
+ }
+ 
+diff -ur rc-scripts-0.4.11.orig/rc.d/rc rc-scripts-0.4.11/rc.d/rc
+--- rc-scripts-0.4.11.orig/rc.d/rc     2013-11-18 21:13:37.000000000 +0000
++++ rc-scripts-0.4.11/rc.d/rc  2014-05-17 10:10:26.085999953 +0000
+@@ -147,14 +147,15 @@
+ text="$(termput op)$(nls '%sResource Manager: %sEntering runlevel number' "$af2" "$af7")"
+ text_size="$(nls '%sResource Manager: %sEntering runlevel number' "" "")"
+ resp_size="$(nls 'DONE')"
+-{
+-      local _len=${#text_size}
+-      local _last_col=$(($INIT_COL+${#resp_size}-${#runlevel}))
+-      while [ $((_len++)) -lt $_last_col ]; do
+-              text="$text."
+-      done
+-      echo -n "$text"
+-}
++
++_len=${#text_size}
++_last_col=$(($INIT_COL+${#resp_size}-${#runlevel}))
++while [ $((_len++)) -lt $_last_col ]; do
++      text="$text."
++done
++echo -n "$text"
++unset _len _last_col
++
+ echo "${af6}[${af2} $runlevel ${af6}]${af7}"
+ 
+ # Is there an rc directory for this new runlevel?
 diff -ur rc-scripts-0.4.11.orig/rc.d/rc.sysinit rc-scripts-0.4.11/rc.d/rc.sysinit
 --- rc-scripts-0.4.11.orig/rc.d/rc.sysinit     2014-03-02 10:02:29.000000000 +0000
 +++ rc-scripts-0.4.11/rc.d/rc.sysinit  2014-05-11 15:06:33.166000019 +0000