diff options
| author | Bill Nottingham <notting@redhat.com> | 2011-05-31 17:35:33 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2011-05-31 17:35:33 -0400 |
| commit | 60ddb21fcdfb0594a35978aa0b04af4527c46d6e (patch) | |
| tree | c1dec0611ba7e8c0306982f4548b535694ef5711 /sysconfig/network-scripts/network-functions | |
| parent | 1019b73ba59dd0b842550eb79aef7c4ae8d1dce2 (diff) | |
| download | initscripts-60ddb21fcdfb0594a35978aa0b04af4527c46d6e.tar initscripts-60ddb21fcdfb0594a35978aa0b04af4527c46d6e.tar.gz initscripts-60ddb21fcdfb0594a35978aa0b04af4527c46d6e.tar.bz2 initscripts-60ddb21fcdfb0594a35978aa0b04af4527c46d6e.tar.xz initscripts-60ddb21fcdfb0594a35978aa0b04af4527c46d6e.zip | |
Ensure DHCP_HOSTNAME is a short hostname, seed it from HOSTNAME if needed. (#697877)
Diffstat (limited to 'sysconfig/network-scripts/network-functions')
| -rw-r--r-- | sysconfig/network-scripts/network-functions | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index 5815eaa9..2d3263a2 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -190,6 +190,8 @@ expand_config () i=$((i+1)) done + [ -n "$DHCP_HOSTNAME" ] && DHCP_HOSTNAME=${DHCP_HOSTNAME%%.*} + if [ -z "${NETWORK}" ]; then eval $(/bin/ipcalc --network ${ipaddr[0]} ${netmask[0]}) fi |