From 28c1570b1e9dfdb7c4a4631dadeb841b21c396c5 Mon Sep 17 00:00:00 2001 From: zhaoxiaohu Date: Mon, 26 Aug 2024 20:28:13 +0800 Subject: [PATCH 1/4] nspawn: fix directory in logged error Signed-off-by: zhaoxiaohu --- ...nspawn-fix-directory-in-logged-error.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 backport-nspawn-fix-directory-in-logged-error.patch diff --git a/backport-nspawn-fix-directory-in-logged-error.patch b/backport-nspawn-fix-directory-in-logged-error.patch new file mode 100644 index 0000000..ecc7164 --- /dev/null +++ b/backport-nspawn-fix-directory-in-logged-error.patch @@ -0,0 +1,32 @@ +From 2c94d4d1bff44646baa50c1878645b86ef229cc0 Mon Sep 17 00:00:00 2001 +From: zhaoxiaohu +Date: Mon, 26 Aug 2024 20:12:57 +0800 +Subject: [PATCH] nspawn: fix directory in logged error + +(cherry picked from commit 7b03b44ed9f5f748670aa26193274dae94468149) +(cherry picked from commit cad1e9c53d7ce0b8e461c094d6244a6409c80ab6) +(cherry picked from commit 3a44be9ad0d9e718c2a79d42d43f2f453b3e6e58) +(cherry picked from commit b98d71f53cdc0fa72c7ec98b6dde386001e73a08) + +Signed-off-by: ml <6209465+ml-@users.noreply.github.com> +Signed-off-by: zhaoxiaohu +--- + src/nspawn/nspawn-bind-user.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/nspawn/nspawn-bind-user.c b/src/nspawn/nspawn-bind-user.c +index 6852125..6c2da8a 100644 +--- a/src/nspawn/nspawn-bind-user.c ++++ b/src/nspawn/nspawn-bind-user.c +@@ -400,7 +400,7 @@ int bind_user_setup( + + r = userns_mkdir(root, "/run/host/home", 0755, 0, 0); + if (r < 0) +- return log_error_errno(r, "Failed to create /run/host/userdb: %m"); ++ return log_error_errno(r, "Failed to create /run/host/home: %m"); + + r = userns_mkdir(root, "/run/host/userdb", 0755, 0, 0); + if (r < 0) +-- +2.33.0 + -- Gitee From 363978ddf1323c6c825263461e92cf501d1e3fab Mon Sep 17 00:00:00 2001 From: zhaoxiaohu Date: Mon, 26 Aug 2024 20:28:51 +0800 Subject: [PATCH 2/4] man: fix directory for user home bind mounts Signed-off-by: zhaoxiaohu --- ...-directory-for-user-home-bind-mounts.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 backport-man-fix-directory-for-user-home-bind-mounts.patch diff --git a/backport-man-fix-directory-for-user-home-bind-mounts.patch b/backport-man-fix-directory-for-user-home-bind-mounts.patch new file mode 100644 index 0000000..594e9d5 --- /dev/null +++ b/backport-man-fix-directory-for-user-home-bind-mounts.patch @@ -0,0 +1,32 @@ +From 90c19618f71ac905419a269569dcb141c4473d33 Mon Sep 17 00:00:00 2001 +From: zhaoxiaohu +Date: Mon, 26 Aug 2024 20:18:22 +0800 +Subject: [PATCH] man: fix directory for user home bind mounts + +(cherry picked from commit f39d7d00a31c1867d5fa41b3dd4e6d20665a8f3a) +(cherry picked from commit bfaf02348e1086c9ce2e4503ef03dc75ed4f1afb) +(cherry picked from commit 067b5b7e892ffa420628fef026ea4d1e16b2110d) +(cherry picked from commit 1b7b67d22a8bd000096a0f00f97d68fc90e5eaa3) + +Signed-off-by: zhaoxiaohu +Signed-off-by: ml <6209465+ml-@users.noreply.github.com> +--- + man/systemd-nspawn.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml +index e929d32..2421de2 100644 +--- a/man/systemd-nspawn.xml ++++ b/man/systemd-nspawn.xml +@@ -1361,7 +1361,7 @@ After=sys-subsystem-net-devices-ens1.device + + + The user's home directory is bind mounted from the host into +- /run/hosts/home/. ++ /run/host/home/. + + An additional UID/GID mapping is added that maps the host user's UID/GID to a + container UID/GID, allocated from the 60514…60577 range. +-- +2.33.0 + -- Gitee From c297b5daf7173f5e864386694dec344af59255b3 Mon Sep 17 00:00:00 2001 From: zhaoxiaohu Date: Mon, 26 Aug 2024 20:29:23 +0800 Subject: [PATCH 3/4] test-boot-timestamp: Handle ERANGE error Signed-off-by: zhaoxiaohu --- ...t-boot-timestamp-Handle-ERANGE-error.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 backport-test-boot-timestamp-Handle-ERANGE-error.patch diff --git a/backport-test-boot-timestamp-Handle-ERANGE-error.patch b/backport-test-boot-timestamp-Handle-ERANGE-error.patch new file mode 100644 index 0000000..7d076cf --- /dev/null +++ b/backport-test-boot-timestamp-Handle-ERANGE-error.patch @@ -0,0 +1,34 @@ +From 0659728c4837be92e0f8718c402583a4ad9f1853 Mon Sep 17 00:00:00 2001 +From: zhaoxiaohu +Date: Mon, 26 Aug 2024 20:21:56 +0800 +Subject: [PATCH] test-boot-timestamp: Handle ERANGE error + +Timestampfs from sysfs files can be zero in which case ERANGE will +be returned so let's make sure we catch that. + +(cherry picked from commit 0da4cc97b446b43802692f2415e5a774771b0ca9) +(cherry picked from commit ef96e60f18c6fd267dc0e942120a95fe25a94960) +(cherry picked from commit 18a2aaf2f6c2c55f825632c25b07b121f6a1bb78) + +Signed-off-by: zhaoxiaohu +Signed-off-by: Daan De Meyer +--- + src/test/test-boot-timestamps.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/test/test-boot-timestamps.c b/src/test/test-boot-timestamps.c +index ae5b582..35268c1 100644 +--- a/src/test/test-boot-timestamps.c ++++ b/src/test/test-boot-timestamps.c +@@ -17,7 +17,7 @@ static int test_acpi_fpdt(void) { + + r = acpi_get_boot_usec(&loader_start, &loader_exit); + if (r < 0) { +- bool ok = r == -ENOENT || r == -EACCES || r == -ENODATA; ++ bool ok = r == -ENOENT || r == -EACCES || r == -ENODATA || r == -ERANGE; + + log_full_errno(ok ? LOG_DEBUG : LOG_ERR, r, "Failed to read ACPI FPDT: %m"); + return ok ? 0 : r; +-- +2.33.0 + -- Gitee From ba4e69273d8cc4a1592071e11cb8c8c64d418544 Mon Sep 17 00:00:00 2001 From: zhaoxiaohu Date: Mon, 26 Aug 2024 20:38:05 +0800 Subject: [PATCH 4/4] add backport-man-fix-directory-for-user-home-bind-mounts.patch backport-nspawn-fix-directory-in-logged-error.patch backport-test-boot-timestamp-Handle-ERANGE-error.patch Signed-off-by: zhaoxiaohu --- systemd.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/systemd.spec b/systemd.spec index 4fa74b5..eab7e2f 100644 --- a/systemd.spec +++ b/systemd.spec @@ -21,7 +21,7 @@ Name: systemd Url: https://systemd.io/ Version: 249 -Release: 76 +Release: 77 License: MIT and LGPLv2+ and GPLv2+ Summary: System and Service Manager @@ -642,6 +642,9 @@ Patch6593: backport-CVE-2023-50387.patch Patch6594: backport-CVE-2023-50868.patch Patch6595: backport-login-user-runtime-dir-properly-check-for-mount-poin.patch Patch6596: backport-user-util-validate-the-right-field.patch +Patch6597: backport-man-fix-directory-for-user-home-bind-mounts.patch +Patch6598: backport-nspawn-fix-directory-in-logged-error.patch +Patch6599: backport-test-boot-timestamp-Handle-ERANGE-error.patch Patch9001: update-rtc-with-system-clock-when-shutdown.patch Patch9002: udev-add-actions-while-rename-netif-failed.patch @@ -2145,6 +2148,11 @@ grep -q -E '^KEYMAP="?fi-latin[19]"?' /etc/vconsole.conf 2>/dev/null && %{_libdir}/security/pam_systemd.so %changelog +* Mon Aug 26 2024 zhaoxiaohu - 249-77 +- add backport-man-fix-directory-for-user-home-bind-mounts.patch + backport-nspawn-fix-directory-in-logged-error.patch + backport-test-boot-timestamp-Handle-ERANGE-error.patch + * Thu May 30 2024 wangyuhang - 249-76 - add backport-units-modprobe-.service-don-t-unescape-instance-name.patch -- Gitee