diff options
| author |   Christian Heim <phreak@gentoo.org> | 2006-02-14 13:00:44 +0000 |
|---|---|---|
| committer | Christian Heim <phreak@gentoo.org> | 2006-02-14 13:00:44 +0000 |
| commit | edf64857241690199cb5c4a7ada6283daa67be2c (patch) | |
| tree | 5769bc8952f9bb9c2a3f001f5fa1870e6db8da19 /net-scripts/net.modules.d/ifconfig | |
| parent | Merging r1851 (diff) | |
| download | baselayout-vserver-edf64857241690199cb5c4a7ada6283daa67be2c.tar.gz baselayout-vserver-edf64857241690199cb5c4a7ada6283daa67be2c.tar.bz2 baselayout-vserver-edf64857241690199cb5c4a7ada6283daa67be2c.zip | |
Merging r1881
svn path=/baselayout-vserver/trunk/; revision=236
Diffstat (limited to 'net-scripts/net.modules.d/ifconfig')
| -rw-r--r-- | net-scripts/net.modules.d/ifconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net-scripts/net.modules.d/ifconfig b/net-scripts/net.modules.d/ifconfig index 35db157..a7bbff8 100644 --- a/net-scripts/net.modules.d/ifconfig +++ b/net-scripts/net.modules.d/ifconfig @@ -390,7 +390,7 @@ ifconfig_add_address() { local metric ifvar=$(bash_variable "${real_iface}") # Remove the newly added route and replace with our metric metric="metric_${ifvar}" - [[ ${!metric} == "0" || ${RC_AUTO_INTERFACE} != "yes" ]] && return ${r} + [[ ${!metric:-0} == "0" ]] && return ${r} if [[ -z ${netmask} ]]; then for (( i=1; i<${#config[@]}-1; i++ )); do @@ -407,7 +407,7 @@ ifconfig_add_address() { if route del -net "${network}/${cidr}" metric 0 dev "${iface}" \ 2>/dev/null ; then - route add -net "${network}/${cidr}" metric "${!metric}" dev "${iface}" + route add -net "${network}/${cidr}" metric "${!metric:-0}" dev "${iface}" fi return ${r} |