- drop fedora/redhat "comaptibility", breaks screen handling with bash
authorMarcin Krol <hawk@tld-linux.org>
Sat, 17 May 2014 12:59:03 +0000 (12:59 +0000)
committerMarcin Krol <hawk@tld-linux.org>
Sat, 17 May 2014 12:59:03 +0000 (12:59 +0000)
  (only carriage return, no newline and all messages overlaps)

rc-scripts-sh_fixes.patch

index bd66f65..7a1eddf 100644 (file)
@@ -1,3 +1,42 @@
+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