diff options
Diffstat (limited to 'sysconfig/network-scripts/ifup')
| -rwxr-xr-x | sysconfig/network-scripts/ifup | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup index b1c4d275..cd2c2286 100755 --- a/sysconfig/network-scripts/ifup +++ b/sysconfig/network-scripts/ifup @@ -98,11 +98,11 @@ if [ -n "${HWADDR}" ]; then sed 's/.*link\/ether \([[:alnum:]:]*\).*/\1/'` if [ "${FOUNDMACADDR}" != "${HWADDR}" ]; then NEWCONFIG=`fgrep -l "HWADDR=${HWADDR}" /etc/sysconfig/network-scripts/ifcfg-*` - if [ -n "${NEWCONFIG}" ]; then + if [ -n "${NEWCONFIG}" -a "`basename ${NEWCONFIG}`" != "${CONFIG}" ]; then exec /sbin/ifup ${NEWCONFIG} fi NEWCONFIG=`fgrep -l "HWADDR=${HWADDR}" /etc/sysconfig/networking/default/ifcfg-*` - if [ -n "${NEWCONFIG}" ]; then + if [ -n "${NEWCONFIG}" -a "`basename ${NEWCONFIG}`" != "${CONFIG}" ]; then exec /sbin/ifup ${NEWCONFIG} else echo $"Device ${DEVICE} has different MAC address than expected, ignoring." @@ -148,8 +148,8 @@ if [ -n "${DYNCONFIG}" ]; then PUMPARGS=$PUMPARGS DHCPCDARGS="$DHCPCDARGS -n" if [ -n "${DHCP_HOSTNAME}" ]; then - PUMPARGS="-h ${DHCP_HOSTNAME}" - DHCPCDARGS="-h ${DHCP_HOSTNAME}" + PUMPARGS="${PUMPARGS} -h ${DHCP_HOSTNAME}" + DHCPCDARGS="${DHCPCDARGS} -h ${DHCP_HOSTNAME}" fi if [ -n "${NEEDHOSTNAME}" ]; then PUMPARGS="${PUMPARGS} --lookup-hostname" |