]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
networkd: send dhcp option NTP when UseNTP is true (#6726)
authorjuga0 <juga@riseup.net>
Tue, 5 Sep 2017 10:26:32 +0000 (10:26 +0000)
committerLennart Poettering <lennart@poettering.net>
Tue, 5 Sep 2017 10:26:32 +0000 (12:26 +0200)
src/network/networkd-dhcp4.c

index 77771688e139f8d62892c6d004fca2f81052389e..84a25b1a03e0e740e71e66dfda328dcfdd9ccd22 100644 (file)
@@ -635,10 +635,11 @@ int dhcp4_configure(Link *link) {
                         return r;
         }
 
-        /* Always acquire the timezone and NTP */
-        r = sd_dhcp_client_set_request_option(link->dhcp_client, SD_DHCP_OPTION_NTP_SERVER);
-        if (r < 0)
-                return r;
+        if (link->network->dhcp_use_ntp) {
+                r = sd_dhcp_client_set_request_option(link->dhcp_client, SD_DHCP_OPTION_NTP_SERVER);
+                if (r < 0)
+                        return r;
+        }
 
         r = sd_dhcp_client_set_request_option(link->dhcp_client, SD_DHCP_OPTION_NEW_TZDB_TIMEZONE);
         if (r < 0)