[PATCH rhel7-branch] Honor hostname set in kickstart (#988483)

David Shea dshea at redhat.com
Fri Jul 26 14:00:59 UTC 2013


On 07/26/2013 09:01 AM, Radek Vykydal wrote:
> ---
>   pyanaconda/network.py | 5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/pyanaconda/network.py b/pyanaconda/network.py
> index 07030a2..028f65e 100644
> --- a/pyanaconda/network.py
> +++ b/pyanaconda/network.py
> @@ -944,8 +944,9 @@ def wait_for_connecting_NM_thread(ksdata):
>       # connection (e.g. auto default dhcp) is activated by NM service
>       connected = _wait_for_connecting_NM()
>       if connected:
> -        hostname = getHostname()
> -        update_hostname_data(ksdata, hostname)
> +        if ksdata.network.hostname == DEFAULT_HOSTNAME:
> +            hostname = getHostname()
> +            update_hostname_data(ksdata, hostname)
>           _get_ntp_servers_from_dhcp(ksdata)
>       with network_connected_condition:
>           global network_connected
Right now this doesn't apply cleanly to rhel7-branch since the branch 
doesn't have the patch from 2423e5ae on master, which changes the 
context in wait_for_connecting_NM_thread. Other than that, looks good to 
me for both rhel7-branch and master (bz #981934).


More information about the anaconda-patches mailing list