Merge ~enr0n/ubuntu/+source/systemd:ubuntu-jammy into ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-jammy

[Nick Rosbrook]

Stage several changes for upcoming SRU.

[Lukas Märdian (slyon)]

Thank you, LGTM.

The "Ensure dns_search_domain_unlink_marked removes all marked domains (LP: #1975667)" line in d/changelog is > 80 chars, but meh... the autogenerated lines below are longer by design, too.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 95b5b03..2892adb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+systemd (249.11-0ubuntu3.5) UNRELEASED; urgency=medium
+
+  * Ensure dns_search_domain_unlink_marked removes all marked domains (LP: #1975667)
+    File: debian/patches/lp1975667-Ensure-dns_search_domain_unlink_marked-removes-all-marked.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=919d5ddedd5bb8b45ab9437bf42d66c2821bb074
+  * core,firstboot: workaround timezone issues on Ubuntu Core (LP: #1981042)
+    Thanks to Robert Ancell for preparing the patch.
+    File: debian/patches/lp1981042-core-firstboot-workaround-timezone-issues-caused-by-Ubunt.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b15546361b549217908fb6ca5d473be23d7fa757
+  * network: do not remove localhost address (LP: #1979951)
+    File: debian/patches/lp1979951-network-do-not-remove-localhost-address.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=2cd88391cce9fe95a486ae6dd214c12f236f3881
+  * units: remove the restart limit on the modprobe@.service (LP: #1982462)
+    File: debian/patches/lp1982462-units-remove-the-restart-limit-on-the-modprobe-.service.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=8f0acd1b2fbb8eed1259c34963e5e9b201bef900
+  * pstore: do not try to load mtdpstore (LP: #1981622)
+    File: debian/patches/lp1978079-efi-pstore-not-cleared-on-boot.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=15225032c3657f5906ee49d48929f9295a8664a0
+
+ -- Nick Rosbrook <[e-mail]>  Fri, 22 Jul 2022 15:27:16 -0400
+
 systemd (249.11-0ubuntu3.4) jammy; urgency=medium
 
   [ Mustafa Kemal Gilor ]
diff --git a/debian/patches/lp1975667-Ensure-dns_search_domain_unlink_marked-removes-all-marked.patch b/debian/patches/lp1975667-Ensure-dns_search_domain_unlink_marked-removes-all-marked.patch
new file mode 100644
index 0000000..65668d7
--- /dev/null
+++ b/debian/patches/lp1975667-Ensure-dns_search_domain_unlink_marked-removes-all-marked.patch
@@ -0,0 +1,24 @@
+From: Ben Efros <[e-mail]>
+Date: Fri, 8 Apr 2022 15:31:09 -0700
+Subject: Ensure dns_search_domain_unlink_marked removes all marked domains
+
+Origin: upstream, https://github.com/systemd/systemd/commit/1196b6a2e61075c029cb959f1e866af04e01fbe4
+Bug-Ubuntu: https://launchpad.net/bugs/1975667
+
+---
+ src/resolve/resolved-dns-search-domain.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/resolve/resolved-dns-search-domain.c b/src/resolve/resolved-dns-search-domain.c
+index 94a4657..abfe4e5 100644
+--- a/src/resolve/resolved-dns-search-domain.c
++++ b/src/resolve/resolved-dns-search-domain.c
+@@ -166,7 +166,7 @@ bool dns_search_domain_unlink_marked(DnsSearchDomain *first) {
+         } else
+                 changed = false;
+ 
+-        return changed || dns_search_domain_unlink_marked(next);
++        return dns_search_domain_unlink_marked(next) || changed;
+ }
+ 
+ void dns_search_domain_mark_all(DnsSearchDomain *first) {
diff --git a/debian/patches/lp1978079-efi-pstore-not-cleared-on-boot.patch b/debian/patches/lp1978079-efi-pstore-not-cleared-on-boot.patch
index 2b282d0..9331b73 100644
--- a/debian/patches/lp1978079-efi-pstore-not-cleared-on-boot.patch
+++ b/debian/patches/lp1978079-efi-pstore-not-cleared-on-boot.patch
@@ -3,6 +3,14 @@ From: Alexander Graf <[e-mail]>
 Date: Thu, 9 Jun 2022 16:20:43 +0200
 Subject: [PATCH] pstore: Run after modules are loaded
 
+Origin: upstream, https://github.com/systemd/systemd/commit/70e74a5997ae2ce7ba72a74ac949c3b2dad1a1d6
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1978079
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1981622
+Last-Updated: 2022-07-22
+
+The original commit has been modified to not load mtdpstore.
+
+---
 The systemd-pstore service takes pstore files on boot and transfers them
 to disk. It only does it once on boot and only if it finds any. The typical
 location of the pstore on modern systems is the UEFI variable store.
@@ -34,8 +42,8 @@ index 848e311e9642..86de30ad4a72 100644
  DefaultDependencies=no
  Conflicts=shutdown.target
  Before=sysinit.target shutdown.target
-+After=modprobe@efi_pstore.service [e-mail] modprobe@chromeos_pstore.service [e-mail] modprobe@pstore_zone.service modprobe@pstore_blk.service
-+Wants=modprobe@efi_pstore.service [e-mail] modprobe@chromeos_pstore.service [e-mail] modprobe@pstore_zone.service modprobe@pstore_blk.service
++After=modprobe@efi_pstore.service modprobe@chromeos_pstore.service [e-mail] modprobe@pstore_zone.service modprobe@pstore_blk.service
++Wants=modprobe@efi_pstore.service modprobe@chromeos_pstore.service [e-mail] modprobe@pstore_zone.service modprobe@pstore_blk.service
  
  [Service]
  Type=oneshot
diff --git a/debian/patches/lp1979951-network-do-not-remove-localhost-address.patch b/debian/patches/lp1979951-network-do-not-remove-localhost-address.patch
new file mode 100644
index 0000000..8641259
--- /dev/null
+++ b/debian/patches/lp1979951-network-do-not-remove-localhost-address.patch
@@ -0,0 +1,66 @@
+From: Yu Watanabe <[e-mail]>
+Date: Mon, 31 Jan 2022 19:26:51 +0900
+Subject: network: do not remove localhost address
+
+Origin: upstream, https://github.com/systemd/systemd/commit/b69bfa43052586cd6894c32d7d3d447195539ec5
+Bug-Ubuntu: https://launchpad.net/bugs/1979951
+
+Managing loopback interfaces by networkd is not recommended, but supporeted.
+Even such spurious situation, do not drop the localhost addresses.
+---
+ src/basic/in-addr-util.c       | 13 +++++++++++++
+ src/basic/in-addr-util.h       |  1 +
+ src/network/networkd-address.c |  4 ++++
+ 3 files changed, 18 insertions(+)
+
+diff --git a/src/basic/in-addr-util.c b/src/basic/in-addr-util.c
+index 9cc92a1..ac51483 100644
+--- a/src/basic/in-addr-util.c
++++ b/src/basic/in-addr-util.c
+@@ -121,6 +121,19 @@ int in_addr_is_localhost(int family, const union in_addr_union *u) {
+         return -EAFNOSUPPORT;
+ }
+ 
++int in_addr_is_localhost_one(int family, const union in_addr_union *u) {
++        assert(u);
++
++        if (family == AF_INET)
++                /* 127.0.0.1 */
++                return be32toh(u->in.s_addr) == UINT32_C(0x7F000001);
++
++        if (family == AF_INET6)
++                return IN6_IS_ADDR_LOOPBACK(&u->in6); /* lgtm [cpp/potentially-dangerous-function] */
++
++        return -EAFNOSUPPORT;
++}
++
+ bool in6_addr_is_ipv4_mapped_address(const struct in6_addr *a) {
+         return a->s6_addr32[0] == 0 &&
+                 a->s6_addr32[1] == 0 &&
+diff --git a/src/basic/in-addr-util.h b/src/basic/in-addr-util.h
+index f3ead91..215aa95 100644
+--- a/src/basic/in-addr-util.h
++++ b/src/basic/in-addr-util.h
+@@ -55,6 +55,7 @@ bool in6_addr_is_link_local_all_nodes(const struct in6_addr *a);
+ 
+ bool in4_addr_is_localhost(const struct in_addr *a);
+ int in_addr_is_localhost(int family, const union in_addr_union *u);
++int in_addr_is_localhost_one(int family, const union in_addr_union *u);
+ 
+ bool in4_addr_is_local_multicast(const struct in_addr *a);
+ bool in4_addr_is_non_local(const struct in_addr *a);
+diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
+index 2f19a82..71329c6 100644
+--- a/src/network/networkd-address.c
++++ b/src/network/networkd-address.c
+@@ -883,6 +883,10 @@ int link_drop_foreign_addresses(Link *link) {
+                 if (address->family == AF_INET6 && in6_addr_is_link_local(&address->in_addr.in6) == 1)
+                         continue;
+ 
++                /* Do not remove localhost address (127.0.0.1 and ::1) */
++                if (link->flags & IFF_LOOPBACK && in_addr_is_localhost_one(address->family, &address->in_addr) > 0)
++                        continue;
++
+                 if (link_address_is_dynamic(link, address)) {
+                         if (link->network && FLAGS_SET(link->network->keep_configuration, KEEP_CONFIGURATION_DHCP))
+                                 continue;
diff --git a/debian/patches/lp1981042-core-firstboot-workaround-timezone-issues-caused-by-Ubunt.patch b/debian/patches/lp1981042-core-firstboot-workaround-timezone-issues-caused-by-Ubunt.patch
new file mode 100644
index 0000000..7d64066
--- /dev/null
+++ b/debian/patches/lp1981042-core-firstboot-workaround-timezone-issues-caused-by-Ubunt.patch
@@ -0,0 +1,110 @@
+Description: Workaround timezone issues cause by Ubuntu Core's read-only /etc
+ This is another patch in a series of existing ones working around this issue
+ on Ubuntu Core.
+Author: Nick Rosbrook <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1981042
+Bug-Ubuntu: https://bugs.launchpad.net/snappy/+bug/1953172
+Forwarded: not-needed (part of read-only /etc workaround)
+Last-Update: 2022-07-20
+---
+diff --git a/src/core/manager.c b/src/core/manager.c
+index 296b759..230e5c8 100644
+--- a/src/core/manager.c
++++ b/src/core/manager.c
+@@ -424,6 +424,25 @@ static int manager_setup_time_change(Manager *m) {
+         return 0;
+ }
+ 
++/* Hack for Ubuntu Phone/Core: check if path is an existing symlink to
++ * /etc/writable; if it is, update that instead */
++static const char* writable_filename(const char *path) {
++        ssize_t r;
++        static char realfile_buf[PATH_MAX];
++        _cleanup_free_ char *realfile = NULL;
++        const char *result = path;
++        int orig_errno = errno;
++
++        r = readlink_and_make_absolute(path, &realfile);
++        if (r >= 0 && startswith(realfile, "/etc/writable")) {
++                snprintf(realfile_buf, sizeof(realfile_buf), "%s", realfile);
++                result = realfile_buf;
++        }
++
++        errno = orig_errno;
++        return result;
++}
++
+ static int manager_read_timezone_stat(Manager *m) {
+         struct stat st;
+         bool changed;
+@@ -431,7 +450,7 @@ static int manager_read_timezone_stat(Manager *m) {
+         assert(m);
+ 
+         /* Read the current stat() data of /etc/localtime so that we detect changes */
+-        if (lstat("/etc/localtime", &st) < 0) {
++        if (lstat(writable_filename("/etc/localtime"), &st) < 0) {
+                 log_debug_errno(errno, "Failed to stat /etc/localtime, ignoring: %m");
+                 changed = m->etc_localtime_accessible;
+                 m->etc_localtime_accessible = false;
+@@ -468,7 +487,7 @@ static int manager_setup_timezone_change(Manager *m) {
+          * Note that we create the new event source first here, before releasing the old one. This should optimize
+          * behaviour as this way sd-event can reuse the old watch in case the inode didn't change. */
+ 
+-        r = sd_event_add_inotify(m->event, &new_event, "/etc/localtime",
++        r = sd_event_add_inotify(m->event, &new_event, writable_filename("/etc/localtime"),
+                                  IN_ATTRIB|IN_MOVE_SELF|IN_CLOSE_WRITE|IN_DONT_FOLLOW, manager_dispatch_timezone_change, m);
+         if (r == -ENOENT) {
+                 /* If the file doesn't exist yet, subscribe to /etc instead, and wait until it is created either by
+diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
+index 3916018..9f2d178 100644
+--- a/src/firstboot/firstboot.c
++++ b/src/firstboot/firstboot.c
+@@ -462,18 +462,37 @@ static int prompt_timezone(void) {
+         return 0;
+ }
+ 
++/* Hack for Ubuntu Phone/Core: check if path is an existing symlink to
++ * /etc/writable; if it is, update that instead */
++static const char* writable_filename(const char *path) {
++        ssize_t r;
++        static char realfile_buf[PATH_MAX];
++        _cleanup_free_ char *realfile = NULL;
++        const char *result = path;
++        int orig_errno = errno;
++
++        r = readlink_and_make_absolute(path, &realfile);
++        if (r >= 0 && startswith(realfile, "/etc/writable")) {
++                snprintf(realfile_buf, sizeof(realfile_buf), "%s", realfile);
++                result = realfile_buf;
++        }
++
++        errno = orig_errno;
++        return result;
++}
++
+ static int process_timezone(void) {
+         const char *etc_localtime, *e;
+         int r;
+ 
+-        etc_localtime = prefix_roota(arg_root, "/etc/localtime");
++        etc_localtime = prefix_roota(arg_root, writable_filename("/etc/localtime"));
+         if (laccess(etc_localtime, F_OK) >= 0 && !arg_force)
+                 return 0;
+ 
+         if (arg_copy_timezone && arg_root) {
+                 _cleanup_free_ char *p = NULL;
+ 
+-                r = readlink_malloc("/etc/localtime", &p);
++                r = readlink_malloc(writable_filename("/etc/localtime"), &p);
+                 if (r != -ENOENT) {
+                         if (r < 0)
+                                 return log_error_errno(r, "Failed to read host timezone: %m");
+@@ -494,7 +513,7 @@ static int process_timezone(void) {
+         if (isempty(arg_timezone))
+                 return 0;
+ 
+-        e = strjoina("../usr/share/zoneinfo/", arg_timezone);
++        e = strjoina("/usr/share/zoneinfo/", arg_timezone);
+ 
+         (void) mkdir_parents(etc_localtime, 0755);
+         if (symlink(e, etc_localtime) < 0)
diff --git a/debian/patches/lp1982462-units-remove-the-restart-limit-on-the-modprobe-.service.patch b/debian/patches/lp1982462-units-remove-the-restart-limit-on-the-modprobe-.service.patch
new file mode 100644
index 0000000..1acc21d
--- /dev/null
+++ b/debian/patches/lp1982462-units-remove-the-restart-limit-on-the-modprobe-.service.patch
@@ -0,0 +1,33 @@
+From: Alban Bedel <[e-mail]>
+Date: Wed, 15 Jun 2022 13:12:46 +0200
+Subject: units: remove the restart limit on the modprobe@.service
+
+Origin: upstream, https://github.com/systemd/systemd/commit/9625350e5381a68c1179ae4581e7586c206663e1
+Bug-Ubuntu: https://launchpad.net/bugs/1982462
+
+They are various cases where the same module might be repeatedly
+loaded in a short time frame, for example if a service depending on a
+module keep restarting, or if many instances of such service get
+started at the same time. If this happend the modprobe@.service
+instance will be marked as failed because it hit the restart limit.
+
+Overall it doesn't seems to make much sense to have a restart limit on
+the modprobe service so just disable it.
+
+Fixes: #23742
+---
+ units/modprobe@.service | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/units/modprobe@.service b/units/modprobe@.service
+index cf8baf6..85a2c08 100644
+--- a/units/modprobe@.service
++++ b/units/modprobe@.service
+@@ -13,6 +13,7 @@ DefaultDependencies=no
+ Before=sysinit.target
+ Documentation=man:modprobe(8)
+ ConditionCapability=CAP_SYS_MODULE
++StartLimitIntervalSec=0
+ 
+ [Service]
+ Type=oneshot
diff --git a/debian/patches/series b/debian/patches/series
index 8dbcd40..3ac0c71 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -89,3 +89,7 @@ lp1926860-hwdb-remove-the-tablet-pad-entry-for-the-UC-Logic-1060N.patch
 hwdb-Add-mic-mute-key-mapping-for-HP-Elite-x360.patch
 lp1964494-network-do-not-enable-IPv4-ACD-for-IPv4-link-local-a.patch
 lp1978079-efi-pstore-not-cleared-on-boot.patch
+lp1975667-Ensure-dns_search_domain_unlink_marked-removes-all-marked.patch
+lp1981042-core-firstboot-workaround-timezone-issues-caused-by-Ubunt.patch
+lp1979951-network-do-not-remove-localhost-address.patch
+lp1982462-units-remove-the-restart-limit-on-the-modprobe-.service.patch