From: Marcin Krol Date: Tue, 22 Jul 2014 16:00:53 +0000 (+0000) Subject: - misc fixes X-Git-Url: https://git.tld-linux.org/?p=packages%2Frc-scripts.git;a=commitdiff_plain;h=2b46f3bfc6697549bd07334c42c041ba78099b9b - misc fixes --- diff --git a/rc-scripts-misc.patch b/rc-scripts-misc.patch new file mode 100644 index 0000000..980338b --- /dev/null +++ b/rc-scripts-misc.patch @@ -0,0 +1,24 @@ +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 @@ + 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 -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 @@ + + 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.