From: Marcin Krol <hawk@tld-linux.org>
Date: Tue, 14 Jul 2015 13:44:14 +0000 (+0000)
Subject: - merged misc fixes
X-Git-Tag: 0.4.14~1
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=a50fdc3af84c5a9f83fd4593dc7cdc7efa3a68ef;p=rc-scripts.git

- merged misc fixes
---

diff --git a/lib/functions b/lib/functions
index 04e7f29..6d68d96 100644
--- a/lib/functions
+++ b/lib/functions
@@ -577,7 +577,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 --git a/lib/ifup-vlan b/lib/ifup-vlan
index 3d72d78..f506c7b 100755
--- a/lib/ifup-vlan
+++ b/lib/ifup-vlan
@@ -46,7 +46,7 @@ if [ ! -f /etc/sysconfig/interfaces/ifcfg-${VLAN_DEV} ]; then
 	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 --git a/rc.d/init.d/network b/rc.d/init.d/network
index 3592a2b..cfbaa72 100755
--- a/rc.d/init.d/network
+++ b/rc.d/init.d/network
@@ -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.