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=7a1eddf831da1f1495e472d27050d18ce373dcd0;hb=7eecf979560f5fbd06f940677f99a5cd743e8347;hpb=be10dac1baff45e310deaa5ef45bf8980cd57d23 diff --git a/rc-scripts-sh_fixes.patch b/rc-scripts-sh_fixes.patch index 7a1eddf..5b7ada0 100644 --- a/rc-scripts-sh_fixes.patch +++ b/rc-scripts-sh_fixes.patch @@ -1,7 +1,7 @@ -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 @@ +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 @@ -19,7 +19,7 @@ diff -ur rc-scripts-0.4.11.orig/lib/functions rc-scripts-0.4.11/lib/functions [ "$env_upstart" ] && USE_UPSTART=$env_upstart if [ -z "$VSERVER" -o "$VSERVER" = "detect" ]; then -@@ -472,7 +461,7 @@ +@@ -471,7 +460,7 @@ busy() { } ok() { @@ -28,7 +28,7 @@ diff -ur rc-scripts-0.4.11.orig/lib/functions rc-scripts-0.4.11/lib/functions } started() { -@@ -480,7 +469,7 @@ +@@ -479,7 +468,7 @@ started() { } fail() { @@ -37,10 +37,10 @@ diff -ur rc-scripts-0.4.11.orig/lib/functions rc-scripts-0.4.11/lib/functions 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 @@ +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')" @@ -64,10 +64,10 @@ diff -ur rc-scripts-0.4.11.orig/rc.d/rc rc-scripts-0.4.11/rc.d/rc 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 -@@ -927,7 +927,7 @@ +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