]> TLD Linux GIT Repositories - packages/rc-scripts.git/blobdiff - rc-scripts-misc.patch
- updated to 0.4.14 (note: we now use our own rc-scripts repository)
[packages/rc-scripts.git] / rc-scripts-misc.patch
diff --git a/rc-scripts-misc.patch b/rc-scripts-misc.patch
deleted file mode 100644 (file)
index 53b0b99..0000000
+++ /dev/null
@@ -1,36 +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: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
--if ! grep -qlE "ONBOOT=[^n][^o]" /etc/sysconfig/interfaces/ifcfg-${VLAN_DEV}; then
-+if ! grep -qlE "ONBOOT=[^n][^o]" /etc/sysconfig/interfaces/ifcfg-${VLAN_DEV} 2>/dev/null; then
-       nls "Warning: ${VLAN_DEV} is disabled on boot."
- fi
-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-*')"
--      bootprio=$(grep '^BOOTPRIO=' $ifcfg_files)
-+      bootprio=$(grep '^BOOTPRIO=' $ifcfg_files 2>/dev/null)
-       if [ -n "$bootprio" ]; then
-               # find all the interfaces besides loopback.