sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dhcp-all-interfaces: correct ifquery return stmt

Browse Source 
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:
Dan Prince 2014-03-27 10:47:55 -04:00
parent 54d16fa9f8
commit 6f764d9119
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.sh
View File

@ -58,12 +58,11 @@ function config_exists() {
if [ "$CONF_TYPE" == "netscripts" ]; then if [ "$CONF_TYPE" == "netscripts" ]; then
if [ -f "/etc/sysconfig/network-scripts/ifcfg-$interface" ]; then if [ -f "/etc/sysconfig/network-scripts/ifcfg-$interface" ]; then
return 0 return 0
else
return 1
fi fi
else else
return ifquery $interface >/dev/null 2>&1 ifquery $interface >/dev/null 2>&1 && return 0
fi fi
return 1
} }
function inspect_interface() { function inspect_interface() {