dhcp-all-interfaces: correct ifquery return stmt
Corrects an issue in the config_exists function that could cause duplicate interfaces to be configured on Ubuntu. Previously we used 'return ifquery' directly which caused a silent 'numberic argument required' error to go unnoticed. This would also return 1 meaning a new interface would get configured. The new logic should handle things properly. Change-Id: I625225e15113d7e184e3bcb5054df1616dec008a Closes-bug: #1298430
This commit is contained in:
parent
54d16fa9f8
commit
6f764d9119
@ -58,12 +58,11 @@ function config_exists() {
|
||||
if [ "$CONF_TYPE" == "netscripts" ]; then
|
||||
if [ -f "/etc/sysconfig/network-scripts/ifcfg-$interface" ]; then
|
||||
return 0
|
||||
else
|
||||
return 1
|
||||
fi
|
||||
else
|
||||
return ifquery $interface >/dev/null 2>&1
|
||||
ifquery $interface >/dev/null 2>&1 && return 0
|
||||
fi
|
||||
return 1
|
||||
}
|
||||
|
||||
function inspect_interface() {
|
||||
|
Loading…
Reference in New Issue
Block a user