- updated for 0.4.13

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

diff --git a/rc-scripts-misc.patch b/rc-scripts-misc.patch
index cfa8ca20a7225b3814c8541a2787b41d63bb96d3..53b0b99bf30b78bf4461627acc18dbf801840ad7 100644 (file)
--- a/rc-scripts-misc.patch
+++ b/rc-scripts-misc.patch
@@ -1,7 +1,19 @@
-diff -ur rc-scripts-0.4.12.orig/lib/ifup-vlan rc-scripts-0.4.12/lib/ifup-vlan
---- rc-scripts-0.4.12.orig/lib/ifup-vlan       2014-06-10 06:55:19.000000000 +0000
-+++ rc-scripts-0.4.12/lib/ifup-vlan    2014-07-22 15:59:17.659000000 +0000
-@@ -44,7 +44,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:41:29.000000000 +0000
++++ rc-scripts-0.4.13/lib/functions    2015-02-06 13:53:57.590314244 +0000
+@@ -579,7 +579,7 @@ run_cmd() {
+               cd /
+               export HOME=/tmp TMPDIR=/tmp
+               if is_no "$RC_LOGGING"; then
+-                      ${user:+setuidgid -s $user} "$@" 2>&1
++                      ${user:+setuidgid -s $user} eval "$@" 2>&1
+               else
+                       ${user:+setuidgid -s $user} initlog -c "$*" 2>&1
+               fi
+diff -urNp rc-scripts-0.4.13.orig/lib/ifup-vlan rc-scripts-0.4.13/lib/ifup-vlan
+--- rc-scripts-0.4.13.orig/lib/ifup-vlan       2015-01-22 16:01:18.000000000 +0000
++++ rc-scripts-0.4.13/lib/ifup-vlan    2015-02-06 13:53:57.585314244 +0000
+@@ -46,7 +46,7 @@ if [ ! -f /etc/sysconfig/interfaces/ifcf
        exit 1
  fi
  
@@ -10,10 +22,10 @@ diff -ur rc-scripts-0.4.12.orig/lib/ifup-vlan rc-scripts-0.4.12/lib/ifup-vlan
        nls "Warning: ${VLAN_DEV} is disabled on boot."
  fi
  
-diff -ur rc-scripts-0.4.12.orig/rc.d/init.d/network rc-scripts-0.4.12/rc.d/init.d/network
---- rc-scripts-0.4.12.orig/rc.d/init.d/network 2014-06-10 06:55:19.000000000 +0000
-+++ rc-scripts-0.4.12/rc.d/init.d/network      2014-07-22 15:59:32.967000000 +0000
-@@ -130,7 +130,7 @@
+diff -urNp rc-scripts-0.4.13.orig/rc.d/init.d/network rc-scripts-0.4.13/rc.d/init.d/network
+--- rc-scripts-0.4.13.orig/rc.d/init.d/network 2014-06-10 06:55:19.000000000 +0000
++++ rc-scripts-0.4.13/rc.d/init.d/network      2015-02-06 13:53:57.589314244 +0000
+@@ -130,7 +130,7 @@ network_interface_configs() {
  
  find_boot_interfaces() {
        ifcfg_files="$(network_interface_configs 'ifcfg-*')"
@@ -22,15 +34,3 @@ diff -ur rc-scripts-0.4.12.orig/rc.d/init.d/network rc-scripts-0.4.12/rc.d/init.
  
        if [ -n "$bootprio" ]; then
                # find all the interfaces besides loopback.
-diff -ur rc-scripts-0.4.12.orig/lib/functions rc-scripts-0.4.12/lib/functions
---- rc-scripts-0.4.12.orig/lib/functions       2014-06-19 19:51:23.000000000 +0000
-+++ rc-scripts-0.4.12/lib/functions    2014-07-25 16:11:36.742000000 +0000
-@@ -590,7 +590,7 @@
-               cd /
-               export HOME=/tmp TMPDIR=/tmp
-               if is_no "$RC_LOGGING"; then
--                      ${user:+setuidgid -s $user} "$@" 2>&1
-+                      ${user:+setuidgid -s $user} eval "$@" 2>&1
-               else
-                       ${user:+setuidgid -s $user} initlog -c "$*" 2>&1
-               fi