X-Git-Url: https://git.tld-linux.org/?p=packages%2Frc-scripts.git;a=blobdiff_plain;f=rc-scripts-sh_fixes.patch;h=5b7ada067b508e63560091f60650947a81c0c3f7;hp=4827cdec2e51ce8572e423bb086a6538b4d9d324;hb=e2bf0309756b52584fc99abe1e1d032368eb5611;hpb=517e171abfcdc05d9eeca7b2c1571d38515a4937

diff --git a/rc-scripts-sh_fixes.patch b/rc-scripts-sh_fixes.patch
index 4827cde..5b7ada0 100644
--- a/rc-scripts-sh_fixes.patch
+++ b/rc-scripts-sh_fixes.patch
@@ -1,7 +1,73 @@
-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
-@@ -927,7 +927,7 @@
+diff -urNp rc-scripts-0.4.13.orig/lib/functions rc-scripts-0.4.13/lib/functions
+--- rc-scripts-0.4.13.orig/lib/functions	2015-02-06 13:30:49.000000000 +0000
++++ rc-scripts-0.4.13/lib/functions	2015-02-06 13:41:29.629314244 +0000
+@@ -61,17 +61,6 @@ env_upstart=$USE_UPSTART
+ [ -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
+@@ -471,7 +460,7 @@ busy() {
+ }
+ 
+ ok() {
+-	echo -ne "$_ok${RC_FEDORA+\\r}${RC_FEDORA-\\n}"
++	echo "$_ok"
+ }
+ 
+ started() {
+@@ -479,7 +468,7 @@ started() {
+ }
+ 
+ fail() {
+-	echo -ne "$_fail${RC_FEDORA+\\r}${RC_FEDORA-\\n}"
++	echo "$_fail"
+ 	return 1
+ }
+ 
+diff -urNp rc-scripts-0.4.13.orig/rc.d/rc rc-scripts-0.4.13/rc.d/rc
+--- rc-scripts-0.4.13.orig/rc.d/rc	2014-06-10 06:55:19.000000000 +0000
++++ rc-scripts-0.4.13/rc.d/rc	2015-02-06 13:41:29.630314244 +0000
+@@ -147,14 +147,15 @@ af7=$(termput op)
+ 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 -urNp rc-scripts-0.4.13.orig/rc.d/rc.sysinit rc-scripts-0.4.13/rc.d/rc.sysinit
+--- rc-scripts-0.4.13.orig/rc.d/rc.sysinit	2015-02-06 13:40:47.000000000 +0000
++++ rc-scripts-0.4.13/rc.d/rc.sysinit	2015-02-06 13:41:29.632314244 +0000
+@@ -966,7 +966,7 @@ if ! is_yes "$VSERVER" && [[ "$container
  		. /etc/rc.d/rc.serial
  	fi