]> TLD Linux GIT Repositories - packages/rc-scripts.git/blob - rc-scripts-misc.patch
- with mdadm 3.x and udev we don't need mdadm.conf to try to init arrays
[packages/rc-scripts.git] / rc-scripts-misc.patch
1 diff -ur rc-scripts-0.4.12.orig/lib/ifup-vlan rc-scripts-0.4.12/lib/ifup-vlan
2 --- rc-scripts-0.4.12.orig/lib/ifup-vlan        2014-06-10 06:55:19.000000000 +0000
3 +++ rc-scripts-0.4.12/lib/ifup-vlan     2014-07-22 15:59:17.659000000 +0000
4 @@ -44,7 +44,7 @@
5         exit 1
6  fi
7  
8 -if ! grep -qlE "ONBOOT=[^n][^o]" /etc/sysconfig/interfaces/ifcfg-${VLAN_DEV}; then
9 +if ! grep -qlE "ONBOOT=[^n][^o]" /etc/sysconfig/interfaces/ifcfg-${VLAN_DEV} 2>/dev/null; then
10         nls "Warning: ${VLAN_DEV} is disabled on boot."
11  fi
12  
13 diff -ur rc-scripts-0.4.12.orig/rc.d/init.d/network rc-scripts-0.4.12/rc.d/init.d/network
14 --- rc-scripts-0.4.12.orig/rc.d/init.d/network  2014-06-10 06:55:19.000000000 +0000
15 +++ rc-scripts-0.4.12/rc.d/init.d/network       2014-07-22 15:59:32.967000000 +0000
16 @@ -130,7 +130,7 @@
17  
18  find_boot_interfaces() {
19         ifcfg_files="$(network_interface_configs 'ifcfg-*')"
20 -       bootprio=$(grep '^BOOTPRIO=' $ifcfg_files)
21 +       bootprio=$(grep '^BOOTPRIO=' $ifcfg_files 2>/dev/null)
22  
23         if [ -n "$bootprio" ]; then
24                 # find all the interfaces besides loopback.