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

[Nick Rosbrook]

[Nick Rosbrook (enr0n)]

I will link PPA autopkgtest results when able.

[Lukas Märdian (slyon)]

+1, matches the upstream fixes and PPA build is green (https://launchpad.net/~enr0n/+archive/ubuntu/systemd-249/+packages).

We can merge this after a passing PPA autopkgtest log is provided.

review: Approve

[Lukas Märdian (slyon)]

Ah, one more note: We still need to prepare the SRU template in LP: #1979952, we should do this before merging, too.

[Nick Rosbrook (enr0n)]

Here are the autopkgtest results:

s390x -- Pass: https://autopkgtest.ubuntu.com/results/autopkgtest-jammy-enr0n-systemd-249/jammy/s390x/s/systemd/20220817_135408_58a4f@/log.gz
ppc64el -- Pass: https://autopkgtest.ubuntu.com/results/autopkgtest-jammy-enr0n-systemd-249/jammy/ppc64el/s/systemd/20220817_141119_7e796@/log.gz
armhf -- Pass: https://autopkgtest.ubuntu.com/results/autopkgtest-jammy-enr0n-systemd-249/jammy/armhf/s/systemd/20220817_132826_32571@/log.gz
arm64 -- Pass: https://autopkgtest.ubuntu.com/results/autopkgtest-jammy-enr0n-systemd-249/jammy/arm64/s/systemd/20220817_151249_2153f@/log.gz
amd64 -- Pass: https://autopkgtest.ubuntu.com/results/autopkgtest-jammy-enr0n-systemd-249/jammy/amd64/s/systemd/20220817_141818_cde61@/log.gz

I also filled out the SRU template for LP: #1979952.

[Lukas Märdian (slyon)]

Thanks, merged!

diff --git a/debian/changelog b/debian/changelog
index 2892adb..da2d281 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,8 +16,13 @@ systemd (249.11-0ubuntu3.5) UNRELEASED; urgency=medium
   * 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
+  * core/mount: downgrade log level about several mkdir failures (LP: #1979952)
+    Files:
+    - debian/patches/lp1979952-Revert-core-mount-fail-early-if-directory-cannot-be-creat.patch
+    - debian/patches/lp1979952-core-mount-downgrade-log-level-about-several-mkdir-failur.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=ee8cfcf500698fab2e990de291ecf4c3ab87a4ae
 
- -- Nick Rosbrook <[e-mail]>  Fri, 22 Jul 2022 15:27:16 -0400
+ -- Nick Rosbrook <[e-mail]>  Tue, 16 Aug 2022 17:45:46 -0400
 
 systemd (249.11-0ubuntu3.4) jammy; urgency=medium
 
diff --git a/debian/patches/lp1979952-Revert-core-mount-fail-early-if-directory-cannot-be-creat.patch b/debian/patches/lp1979952-Revert-core-mount-fail-early-if-directory-cannot-be-creat.patch
 new file mode 100644
index 0000000..3469980
--- /dev/null
+++ b/debian/patches/lp1979952-Revert-core-mount-fail-early-if-directory-cannot-be-creat.patch
@@ -0,0 +1,33 @@
+From: Yu Watanabe <[e-mail]>
+Date: Tue, 26 Jul 2022 23:15:01 +0900
+Subject: Revert "core/mount: fail early if directory cannot be created"
+
+Origin: upstream, https://github.com/systemd/systemd/commit/e5e6b7c225987551ebda14d2d7feadb66a64fb3c
+Bug-Ubuntu: https://launchpad.net/bugs/1979952
+
+This reverts commit e4de58c8231e47509ffeb3aa47620ca42f22d7f6.
+
+If mkdir() fails and the path does exist, then the later mount
+command fails anyway. Hence, it is not necessary to fail here.
+
+Fixes #24120.
+---
+ src/core/mount.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/core/mount.c b/src/core/mount.c
+index 673eec3..af39db2 100644
+--- a/src/core/mount.c
++++ b/src/core/mount.c
+@@ -1035,10 +1035,8 @@ static void mount_enter_mounting(Mount *m) {
+                 r = mkdir_p_label(p->what, m->directory_mode);
+                 /* mkdir_p_label() can return -EEXIST if the target path exists and is not a directory - which is
+                  * totally OK, in case the user wants us to overmount a non-directory inode. */
+-                if (r < 0 && r != -EEXIST) {
++                if (r < 0 && r != -EEXIST)
+                         log_unit_error_errno(UNIT(m), r, "Failed to make bind mount source '%s': %m", p->what);
+-                        goto fail;
+-                }
+         }
+ 
+         if (p) {
diff --git a/debian/patches/lp1979952-core-mount-downgrade-log-level-about-several-mkdir-failur.patch b/debian/patches/lp1979952-core-mount-downgrade-log-level-about-several-mkdir-failur.patch
 new file mode 100644
index 0000000..5f2e1cc
--- /dev/null
+++ b/debian/patches/lp1979952-core-mount-downgrade-log-level-about-several-mkdir-failur.patch
@@ -0,0 +1,31 @@
+From: Yu Watanabe <[e-mail]>
+Date: Tue, 26 Jul 2022 23:23:01 +0900
+Subject: core/mount: downgrade log level about several mkdir failures
+
+Origin: upstream, https://github.com/systemd/systemd/commit/574febda6b0e00aae164b18b70aa80744d950500
+Bug-Ubuntu: https://launchpad.net/bugs/1979952
+
+---
+ src/core/mount.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/mount.c b/src/core/mount.c
+index af39db2..ca8a6cf 100644
+--- a/src/core/mount.c
++++ b/src/core/mount.c
+@@ -1034,9 +1034,13 @@ static void mount_enter_mounting(Mount *m) {
+         if (p && mount_is_bind(p)) {
+                 r = mkdir_p_label(p->what, m->directory_mode);
+                 /* mkdir_p_label() can return -EEXIST if the target path exists and is not a directory - which is
+-                 * totally OK, in case the user wants us to overmount a non-directory inode. */
++                 * totally OK, in case the user wants us to overmount a non-directory inode. Also -EROFS can be
++                 * returned on read-only filesystem. Moreover, -EACCES (and also maybe -EPERM?) may be returned
++                 * when the path is on NFS. See issue #24120. All such errors will be logged in the debug level. */
+                 if (r < 0 && r != -EEXIST)
+-                        log_unit_error_errno(UNIT(m), r, "Failed to make bind mount source '%s': %m", p->what);
++                        log_unit_full_errno(UNIT(m),
++                                            (r == -EROFS || ERRNO_IS_PRIVILEGE(r)) ? LOG_DEBUG : LOG_WARNING,
++                                            r, "Failed to make bind mount source '%s', ignoring: %m", p->what);
+         }
+ 
+         if (p) {
diff --git a/debian/patches/series b/debian/patches/series
index 3ac0c71..eb05e93 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -93,3 +93,5 @@ 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
+lp1979952-Revert-core-mount-fail-early-if-directory-cannot-be-creat.patch
+lp1979952-core-mount-downgrade-log-level-about-several-mkdir-failur.patch