Merge pull request #14064 from yuwata/network-unify-send-option-and-send-raw-option

network: unify SendOption= and SendRawOption=

diff --cc src/libsystemd-network/sd-dhcp-client.c
Simple merge

diff --cc src/network/networkd-dhcp-server.c
index 279f778,98bb647..fc1cd5c
--- 1/src/network/networkd-dhcp-server.c
--- 2/src/network/networkd-dhcp-server.c
+++ b/src/network/networkd-dhcp-server.c
@@@ -302,11 -301,11 +301,11 @@@ int dhcp4_server_configure(Link *link) 
  
                  r = sd_dhcp_server_set_timezone(link->dhcp_server, tz);
                  if (r < 0)
 -                        return r;
 +                        return log_link_error_errno(link, r, "Failed to set timezone for DHCP server: %m");
          }
  
-         ORDERED_HASHMAP_FOREACH(p, link->network->dhcp_server_raw_options, i) {
-                 r = sd_dhcp_server_add_raw_option(link->dhcp_server, p);
+         ORDERED_HASHMAP_FOREACH(p, link->network->dhcp_server_send_options, i) {
+                 r = sd_dhcp_server_add_option(link->dhcp_server, p);
                  if (r == -EEXIST)
                          continue;
                  if (r < 0)