- merged misc fixes

diff --git a/lib/functions b/lib/functions
index 04e7f29332e7ee316b75de17381e6c655fb4fea5..6d68d96a22c6c6aa69cf751d28946617b73fba1e 100644 (file)
--- a/lib/functions
+++ b/lib/functions
@@ -577,7 +577,7 @@ run_cmd() {
                cd /
                export HOME=/tmp TMPDIR=/tmp
                if is_no "$RC_LOGGING"; then
                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
                else
                        ${user:+setuidgid -s $user} initlog -c "$*" 2>&1
                fi

diff --git a/lib/ifup-vlan b/lib/ifup-vlan
index 3d72d7859c3d00c34e47da77319e223b854c9ca9..f506c7b044ad9eb49032659f9463c8fc61517ba1 100755 (executable)
--- a/lib/ifup-vlan
+++ b/lib/ifup-vlan
@@ -46,7 +46,7 @@ if [ ! -f /etc/sysconfig/interfaces/ifcfg-${VLAN_DEV} ]; then
        exit 1
 fi
 
        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
 
        nls "Warning: ${VLAN_DEV} is disabled on boot."
 fi
 

diff --git a/rc.d/init.d/network b/rc.d/init.d/network
index 3592a2b476f104eb83fb047236aa5df875882c21..cfbaa7244386dcb41efd7b46e3e75428ea703e08 100755 (executable)
--- 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-*')"
 
 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.
 
        if [ -n "$bootprio" ]; then
                # find all the interfaces besides loopback.