1 files changed, 7 insertions, 20 deletions

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index d797a8ded8..1dc9db0fca 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -730,7 +730,6 @@ static int link_enter_set_addresses(Link *link) {
         /* now that we can figure out a default address for the dhcp server,
            start it */
         if (link_dhcp4_server_enabled(link)) {
-                struct in_addr pool_start;
                 Address *address;
                 Link *uplink = NULL;
                 bool acquired_uplink = false;
@@ -742,16 +741,9 @@ static int link_enter_set_addresses(Link *link) {
                         return 0;
                 }
 
-                r = sd_dhcp_server_set_address(link->dhcp_server,
-                                               &address->in_addr.in,
-                                               address->prefixlen);
-                if (r < 0)
-                        return r;
-
-                /* offer 32 addresses starting from the address following the server address */
-                pool_start.s_addr = htobe32(be32toh(address->in_addr.in.s_addr) + 1);
-                r = sd_dhcp_server_set_lease_pool(link->dhcp_server,
-                                                  &pool_start, 32);
+                /* use the server address' subnet as the pool */
+                r = sd_dhcp_server_configure_pool(link->dhcp_server, &address->in_addr.in, address->prefixlen,
+                                                  link->network->dhcp_server_pool_offset, link->network->dhcp_server_pool_size);
                 if (r < 0)
                         return r;
 
@@ -760,11 +752,6 @@ static int link_enter_set_addresses(Link *link) {
                                               &main_address->in_addr.in);
                 if (r < 0)
                         return r;
-
-                r = sd_dhcp_server_set_prefixlen(link->dhcp_server,
-                                                 main_address->prefixlen);
-                if (r < 0)
-                        return r;
                 */
 
                 if (link->network->dhcp_server_max_lease_time_usec > 0) {
@@ -980,14 +967,14 @@ static int set_timezone_handler(sd_bus_message *m, void *userdata, sd_bus_error
         return 1;
 }
 
-int link_set_timezone(Link *link, const char *timezone) {
+int link_set_timezone(Link *link, const char *tz) {
         int r;
 
         assert(link);
         assert(link->manager);
-        assert(timezone);
+        assert(tz);
 
-        log_link_debug(link, "Setting system timezone: '%s'", timezone);
+        log_link_debug(link, "Setting system timezone: '%s'", tz);
 
         if (!link->manager->bus) {
                 log_link_info(link, "Not connected to system bus, ignoring timezone.");
@@ -1004,7 +991,7 @@ int link_set_timezone(Link *link, const char *timezone) {
                         set_timezone_handler,
                         link,
                         "sb",
-                        timezone,
+                        tz,
                         false);
         if (r < 0)
                 return log_link_error_errno(link, r, "Could not set timezone: %m");