- updated to 0.4.14 (note: we now use our own rc-scripts repository)

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

diff --git a/rc-scripts-sh_fixes.patch b/rc-scripts-sh_fixes.patch
deleted file mode 100644 (file)
index 5b7ada0..0000000
--- a/rc-scripts-sh_fixes.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-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
- 
--      if [ -n "$PANIC_REBOOT_TIME" -a "$PANIC_REBOOT_TIME" -gt "0" -a -f /proc/sys/kernel/panic ]; then
-+      if [ -n "$PANIC_REBOOT_TIME" ] && [ "$PANIC_REBOOT_TIME" -gt "0" ] && [ -f /proc/sys/kernel/panic ]; then
-               show 'Setting %s seconds for kernel reboot after panic' "$PANIC_REBOOT_TIME"; busy
-               # DEPRECATED: use /etc/sysctl.conf or kernel commandline instead
-               if sysctl -q -w kernel.panic=$PANIC_REBOOT_TIME; then ok; else fail; fi