[PATCH] Don't use dhcp ntpservers for dir or image installation

Brian C. Lane bcl at redhat.com
Wed Apr 9 17:31:28 UTC 2014


The resulting image may be deployed in a completely different network,
so we don't want to set the ntpserver list.
---
 pyanaconda/network.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyanaconda/network.py b/pyanaconda/network.py
index 4227ff1..4366aef 100644
--- a/pyanaconda/network.py
+++ b/pyanaconda/network.py
@@ -1172,7 +1172,8 @@ def _get_ntp_servers_from_dhcp(ksdata):
             hostname = server_address
         hostnames.append(hostname)
     # check if some NTP servers were specified from kickstart
-    if not ksdata.timezone.ntpservers:
+    if not ksdata.timezone.ntpservers \
+       and not (flags.imageInstall or flags.dirInstall):
         # no NTP servers were specified, add those from DHCP
         ksdata.timezone.ntpservers = hostnames
 
-- 
1.9.0



More information about the anaconda-patches mailing list