]> TLD Linux GIT Repositories - packages/rc-scripts.git/blob - rc-scripts-misc.patch
- updated for 0.4.13
[packages/rc-scripts.git] / rc-scripts-misc.patch
1 diff -urNp rc-scripts-0.4.13.orig/lib/functions rc-scripts-0.4.13/lib/functions
2 --- rc-scripts-0.4.13.orig/lib/functions        2015-02-06 13:41:29.000000000 +0000
3 +++ rc-scripts-0.4.13/lib/functions     2015-02-06 13:53:57.590314244 +0000
4 @@ -579,7 +579,7 @@ run_cmd() {
5                 cd /
6                 export HOME=/tmp TMPDIR=/tmp
7                 if is_no "$RC_LOGGING"; then
8 -                       ${user:+setuidgid -s $user} "$@" 2>&1
9 +                       ${user:+setuidgid -s $user} eval "$@" 2>&1
10                 else
11                         ${user:+setuidgid -s $user} initlog -c "$*" 2>&1
12                 fi
13 diff -urNp rc-scripts-0.4.13.orig/lib/ifup-vlan rc-scripts-0.4.13/lib/ifup-vlan
14 --- rc-scripts-0.4.13.orig/lib/ifup-vlan        2015-01-22 16:01:18.000000000 +0000
15 +++ rc-scripts-0.4.13/lib/ifup-vlan     2015-02-06 13:53:57.585314244 +0000
16 @@ -46,7 +46,7 @@ if [ ! -f /etc/sysconfig/interfaces/ifcf
17         exit 1
18  fi
19  
20 -if ! grep -qlE "ONBOOT=[^n][^o]" /etc/sysconfig/interfaces/ifcfg-${VLAN_DEV}; then
21 +if ! grep -qlE "ONBOOT=[^n][^o]" /etc/sysconfig/interfaces/ifcfg-${VLAN_DEV} 2>/dev/null; then
22         nls "Warning: ${VLAN_DEV} is disabled on boot."
23  fi
24  
25 diff -urNp rc-scripts-0.4.13.orig/rc.d/init.d/network rc-scripts-0.4.13/rc.d/init.d/network
26 --- rc-scripts-0.4.13.orig/rc.d/init.d/network  2014-06-10 06:55:19.000000000 +0000
27 +++ rc-scripts-0.4.13/rc.d/init.d/network       2015-02-06 13:53:57.589314244 +0000
28 @@ -130,7 +130,7 @@ network_interface_configs() {
29  
30  find_boot_interfaces() {
31         ifcfg_files="$(network_interface_configs 'ifcfg-*')"
32 -       bootprio=$(grep '^BOOTPRIO=' $ifcfg_files)
33 +       bootprio=$(grep '^BOOTPRIO=' $ifcfg_files 2>/dev/null)
34  
35         if [ -n "$bootprio" ]; then
36                 # find all the interfaces besides loopback.