Merge ~schopin/ubuntu/+source/systemd/+git/systemd-1:impish/hipersocket-dhcp into ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-impish

[Simon Chopin]

[Simon Chopin (schopin)]

As for the hirsute and focal patches, there's a package available at https://launchpad.net/~schopin/+archive/ubuntu/test-ppa/+packages for testing.

diff --git a/debian/patches/lp1914740-network-enable-DHCP-broadcast-flag-if-required-by-in.patch b/debian/patches/lp1914740-network-enable-DHCP-broadcast-flag-if-required-by-in.patch
new file mode 100644
index 0000000..71438cc
--- /dev/null
+++ b/debian/patches/lp1914740-network-enable-DHCP-broadcast-flag-if-required-by-in.patch
@@ -0,0 +1,145 @@
+From 0fd173d4e50f9deddb76a66ab50deccc2dc8329d Mon Sep 17 00:00:00 2001
+From: Viktor Mihajlovski <[e-mail]>
+Date: Wed, 14 Apr 2021 13:01:35 +0200
+Subject: [PATCH] network: enable DHCP broadcast flag if required by interface
+
+Some interfaces require that the DHCPOFFER message is sent via broadcast
+if they can't receive unicast messages before they've been configured
+with an IP address.
+
+E.g., s390 ccwgroup network interfaces operating in layer3 mode face
+this limitation. This can prevent the interfaces from receiving an
+IP address via DHCP, if the have been configured for layer3.
+
+To allow DHCP over such interfaces, we're introducing a new device
+property ID_NET_DHCP_BROADCAST which can be set for those.
+The networkd DHCP client will check whether this property is set
+for an interface, and if so will set the broadcast flag, unless
+the network configuration for the interface has an explicit
+RequestBroadcast setting.
+
+Besides that, we're adding a udev rule to set this device property
+for ccwgroup devices operating in layer3 mode, which is the case
+if the ID_NET_DRIVER property is qeth_l3.
+
+Supercedes #18829
+---
+ rules.d/81-net-dhcp.rules                | 14 ++++++++++++
+ rules.d/meson.build                      |  1 +
+ src/network/networkd-dhcp4.c             | 27 ++++++++++++++++++++++--
+ src/network/networkd-network-gperf.gperf |  4 ++--
+ src/network/networkd-network.c           |  1 +
+ src/network/networkd-network.h           |  2 +-
+ 6 files changed, 44 insertions(+), 5 deletions(-)
+ create mode 100644 rules.d/81-net-dhcp.rules
+
+--- /dev/null
++++ b/rules.d/81-net-dhcp.rules
+@@ -0,0 +1,14 @@
++# do not edit this file, it will be overwritten on update
++
++ACTION=="remove", GOTO="net_dhcp_end"
++SUBSYSTEM!="net", GOTO="net_dhcp_end"
++
++# Network interfaces requiring DHCPOFFER messages to be broadcast
++# must set ID_NET_DHCP_BROADCAST to "1". This property will be
++# checked by the networkd DHCP4 client to set the DHCP option
++
++# s390 ccwgroup interfaces in layer3 mode need broadcast DHCPOFFER
++# using the link driver to detect this condition
++ENV{ID_NET_DRIVER}=="qeth_l3", ENV{ID_NET_DHCP_BROADCAST}="1"
++
++LABEL="net_dhcp_end"
+--- a/rules.d/meson.build
++++ b/rules.d/meson.build
+@@ -26,6 +26,7 @@
+         75-probe_mtd.rules
+         78-sound-card.rules
+         80-net-setup-link.rules
++        81-net-dhcp.rules
+ '''.split())
+ 
+ if conf.get('HAVE_KMOD') == 1
+--- a/src/network/networkd-dhcp4.c
++++ b/src/network/networkd-dhcp4.c
+@@ -1286,6 +1286,30 @@
+         return sd_dhcp_client_set_request_address(link->dhcp_client, &a->in_addr.in);
+ }
+ 
++static bool link_needs_dhcp_broadcast(Link *link) {
++        const char *val;
++        int r;
++
++        assert(link);
++        assert(link->network);
++
++        /* Return the setting in DHCP[4].RequestBroadcast if specified. Otherwise return the device property
++         * ID_NET_DHCP_BROADCAST setting, which may be set for interfaces requiring that the DHCPOFFER message
++         * is being broadcast because they can't  handle unicast messages while not fully configured.
++         * If neither is set or a failure occurs, return false, which is the default for this flag.
++         */
++        r = link->network->dhcp_broadcast;
++        if (r < 0 && link->sd_device && sd_device_get_property_value(link->sd_device, "ID_NET_DHCP_BROADCAST", &val) >= 0) {
++                r = parse_boolean(val);
++                if (r < 0)
++                        log_link_warning_errno(link, r, "DHCP4 CLIENT: Failed to parse ID_NET_DHCP_BROADCAST, ignoring: %m");
++                else
++                        log_link_debug(link, "DHCP4 CLIENT: Detected ID_NET_DHCP_BROADCAST='%d'.", r);
++
++        }
++        return r == true;
++}
++
+ int dhcp4_configure(Link *link) {
+         sd_dhcp_option *send_option;
+         void *request_options;
+@@ -1322,7 +1346,7 @@
+         if (r < 0)
+                 return log_link_warning_errno(link, r, "DHCP4 CLIENT: Failed to set callback: %m");
+ 
+-        r = sd_dhcp_client_set_request_broadcast(link->dhcp_client, link->network->dhcp_broadcast);
++        r = sd_dhcp_client_set_request_broadcast(link->dhcp_client, link_needs_dhcp_broadcast(link));
+         if (r < 0)
+                 return log_link_warning_errno(link, r, "DHCP4 CLIENT: Failed to set request flag for broadcast: %m");
+ 
+--- a/src/network/networkd-network-gperf.gperf
++++ b/src/network/networkd-network-gperf.gperf
+@@ -206,7 +206,7 @@
+ DHCPv4.Anonymize,                            config_parse_bool,                                        0,                             offsetof(Network, dhcp_anonymize)
+ DHCPv4.SendHostname,                         config_parse_bool,                                        0,                             offsetof(Network, dhcp_send_hostname)
+ DHCPv4.Hostname,                             config_parse_hostname,                                    0,                             offsetof(Network, dhcp_hostname)
+-DHCPv4.RequestBroadcast,                     config_parse_bool,                                        0,                             offsetof(Network, dhcp_broadcast)
++DHCPv4.RequestBroadcast,                     config_parse_tristate,                                    0,                             offsetof(Network, dhcp_broadcast)
+ DHCPv4.VendorClassIdentifier,                config_parse_string,                                      0,                             offsetof(Network, dhcp_vendor_class_identifier)
+ DHCPv4.MUDURL,                               config_parse_dhcp_mud_url,                                0,                             0
+ DHCPv4.MaxAttempts,                          config_parse_dhcp_max_attempts,                           0,                             0
+@@ -472,7 +472,7 @@
+ DHCP.Anonymize,                              config_parse_bool,                                        0,                             offsetof(Network, dhcp_anonymize)
+ DHCP.SendHostname,                           config_parse_bool,                                        0,                             offsetof(Network, dhcp_send_hostname)
+ DHCP.Hostname,                               config_parse_hostname,                                    0,                             offsetof(Network, dhcp_hostname)
+-DHCP.RequestBroadcast,                       config_parse_bool,                                        0,                             offsetof(Network, dhcp_broadcast)
++DHCP.RequestBroadcast,                       config_parse_tristate,                                    0,                             offsetof(Network, dhcp_broadcast)
+ DHCP.CriticalConnection,                     config_parse_tristate,                                    0,                             offsetof(Network, dhcp_critical)
+ DHCP.VendorClassIdentifier,                  config_parse_string,                                      0,                             offsetof(Network, dhcp_vendor_class_identifier)
+ DHCP.UserClass,                              config_parse_dhcp_user_or_vendor_class,                   AF_INET,                       offsetof(Network, dhcp_user_class)
+--- a/src/network/networkd-network.c
++++ b/src/network/networkd-network.c
+@@ -383,6 +383,7 @@
+                 .dhcp_use_mtu = false,
+                 /* NOTE: from man: UseTimezone=... Defaults to "no".*/
+                 .dhcp_use_timezone = false,
++                .dhcp_broadcast = -1,
+                 .dhcp_ip_service_type = -1,
+ 
+                 .dhcp6_use_address = true,
+--- a/src/network/networkd-network.h
++++ b/src/network/networkd-network.h
+@@ -135,7 +135,7 @@
+         int dhcp_ip_service_type;
+         bool dhcp_anonymize;
+         bool dhcp_send_hostname;
+-        bool dhcp_broadcast;
++        int dhcp_broadcast;
+         bool dhcp_use_dns;
+         bool dhcp_use_dns_set;
+         bool dhcp_routes_to_dns;
diff --git a/debian/patches/series b/debian/patches/series
index dba1c7d..d281fb1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -53,3 +53,4 @@ lp1894622-Add-systemd-resolve-backwards-compatibility-section-.patch
 lp1858210/0001-time-simplify-get_timezones.patch
 lp1858210/0002-time-split-get_timezone-into-main-function-and-zone1.patch
 lp1858210/0003-time-get-timezones-from-tzdata.zi.patch
+lp1914740-network-enable-DHCP-broadcast-flag-if-required-by-in.patch