[PATCH 2/4] Rename wait_for_dhcp pieces to say what they actually do
Martin Sivak
msivak at redhat.com
Fri Jan 25 12:51:51 UTC 2013
Ack.
----- Original Message -----
> ---
> anaconda | 4 ++--
> pyanaconda/network.py | 6 +++---
> pyanaconda/packaging/__init__.py | 2 +-
> pyanaconda/vnc.py | 2 +-
> 4 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/anaconda b/anaconda
> index f3286b6..366d392 100755
> --- a/anaconda
> +++ b/anaconda
> @@ -971,7 +971,7 @@ if __name__ == "__main__":
>
> from pyanaconda.storage import storageInitialize
> from pyanaconda.packaging import payloadInitialize
> - from pyanaconda.network import networkInitialize,
> networkWaitForDhcp
> + from pyanaconda.network import networkInitialize,
> wait_for_connecting_NM_thread
>
> if anaconda.rescue:
> from pyanaconda.rescue import doRescue
> @@ -980,7 +980,7 @@ if __name__ == "__main__":
>
> networkInitialize(ksdata)
> threadMgr.add(AnacondaThread(name="AnaStorageThread",
> target=storageInitialize, args=(anaconda.storage, ksdata,
> anaconda.protected)))
> - threadMgr.add(AnacondaThread(name="AnaWaitForDhcpThread",
> target=networkWaitForDhcp, args=(ksdata,)))
> +
> threadMgr.add(AnacondaThread(name="AnaWaitForConnectingNMThread",
> target=wait_for_connecting_NM_thread, args=(ksdata,)))
> threadMgr.add(AnacondaThread(name="AnaPayloadThread",
> target=payloadInitialize, args=(anaconda.storage, ksdata,
> anaconda.payload)))
>
> atexit.register(exitHandler, ksdata.reboot, anaconda.storage)
> diff --git a/pyanaconda/network.py b/pyanaconda/network.py
> index 0d9e427..5e7f806 100644
> --- a/pyanaconda/network.py
> +++ b/pyanaconda/network.py
> @@ -940,7 +940,7 @@ def write_network_config(storage, ksdata,
> instClass, rootpath):
> disableNMForStorageDevices(rootpath, storage)
> autostartFCoEDevices(rootpath, storage, ksdata)
>
> -def wait_for_dhcp():
> +def wait_for_connecting_NM():
> """If NM is in connecting state, wait for connection.
> Return value: NM has got connection."""
> bus = dbus.SystemBus()
> @@ -1062,7 +1062,7 @@ def networkInitialize(ksdata):
> if ksdata.network.hostname is None:
> update_hostname(ksdata)
>
> -def networkWaitForDhcp(ksdata):
> +def wait_for_connecting_NM_thread(ksdata):
> # connection (e.g. auto default dhcp) is activated by NM service
> - if wait_for_dhcp():
> + if wait_for_connecting_NM():
> update_hostname(ksdata)
> diff --git a/pyanaconda/packaging/__init__.py
> b/pyanaconda/packaging/__init__.py
> index c3b2051..35bde98 100644
> --- a/pyanaconda/packaging/__init__.py
> +++ b/pyanaconda/packaging/__init__.py
> @@ -669,7 +669,7 @@ def payloadInitialize(storage, ksdata, payload):
>
> # FIXME: condition for cases where we don't want network
> # (set and use payload.needsNetwork ?)
> - networkThread = threadMgr.get("AnaWaitForDhcpThread")
> + networkThread = threadMgr.get("AnaWaitForConnectingNMThread")
> if networkThread:
> networkThread.join()
>
> diff --git a/pyanaconda/vnc.py b/pyanaconda/vnc.py
> index ac26fc7..d86c36c 100644
> --- a/pyanaconda/vnc.py
> +++ b/pyanaconda/vnc.py
> @@ -176,7 +176,7 @@ class VncServer:
>
> def startServer(self):
> self.log.info(_("Starting VNC..."))
> - network.wait_for_dhcp()
> + network.wait_for_connecting_NM()
>
> # Lets call it from here for now.
> try:
> --
> 1.7.11.7
>
> _______________________________________________
> anaconda-patches mailing list
> anaconda-patches at lists.fedorahosted.org
> https://lists.fedorahosted.org/mailman/listinfo/anaconda-patches
>
More information about the anaconda-patches
mailing list