From 9995b53d9037b055a68a36cae009a639fcd3e2d7 Mon Sep 17 00:00:00 2001 From: zhaoxiaohu Date: Wed, 28 Aug 2024 16:44:53 +0800 Subject: [PATCH 1/3] test-boot-timestamp: Handle ERANGE error Signed-off-by: zhaoxiaohu --- ...t-boot-timestamp-Handle-ERANGE-error.patch | 36 +++++++++++++++++++ 1 file changed, 36 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 00000000..2c24f6b8 --- /dev/null +++ b/backport-test-boot-timestamp-Handle-ERANGE-error.patch @@ -0,0 +1,36 @@ +From 0da4cc97b446b43802692f2415e5a774771b0ca9 Mon Sep 17 00:00:00 2001 +From: Daan De Meyer +Date: Mon, 13 Feb 2023 14:27:24 +0100 +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) + +Reference: https://github.com/systemd/systemd-stable/pull/259/commits/6986ac916029217e668cc98955b6a3db9497d073 + +Signed-off-by: zhaoxiaohu +Signed-off-by: yuwang +--- + 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 b51f2d215ac01ef7031028c4756a5abff3dda29d Mon Sep 17 00:00:00 2001 From: zhaoxiaohu Date: Wed, 28 Aug 2024 16:45:59 +0800 Subject: [PATCH 2/3] man: fix directory for user home bind mounts Signed-off-by: zhaoxiaohu --- ...-directory-for-user-home-bind-mounts.patch | 34 +++++++++++++++++++ 1 file changed, 34 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 00000000..6c6b47dd --- /dev/null +++ b/backport-man-fix-directory-for-user-home-bind-mounts.patch @@ -0,0 +1,34 @@ +From f39d7d00a31c1867d5fa41b3dd4e6d20665a8f3a Mon Sep 17 00:00:00 2001 +From: ml <6209465+ml-@users.noreply.github.com> +Date: Sun, 12 Feb 2023 00:30:28 +0100 +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) + +Reference: https://github.com/systemd/systemd-stable/pull/259/commits/a11dc8712c63e57e687b9cdedaba023c50a39820 + +Signed-off-by: zhaoxiaohu +Signed-off-by: yuwang +--- + 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 08cb1d08add6d901fd54725f1ecf5540a69de517 Mon Sep 17 00:00:00 2001 From: zhaoxiaohu Date: Wed, 28 Aug 2024 16:46:52 +0800 Subject: [PATCH 3/3] nspawn: fix directory in logged error Signed-off-by: zhaoxiaohu --- ...nspawn-fix-directory-in-logged-error.patch | 34 +++++++++++++++++++ systemd.spec | 10 +++++- 2 files changed, 43 insertions(+), 1 deletion(-) 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 00000000..5476fda3 --- /dev/null +++ b/backport-nspawn-fix-directory-in-logged-error.patch @@ -0,0 +1,34 @@ +From cad1e9c53d7ce0b8e461c094d6244a6409c80ab6 Mon Sep 17 00:00:00 2001 +From: ml <6209465+ml-@users.noreply.github.com> +Date: Sun, 12 Feb 2023 00:22:52 +0100 +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) + +Reference: https://github.com/systemd/systemd-stable/pull/259/commits/d308228093d07d6a0c9376dff7ea916d8a48de37 + +Signed-off-by: zhaoxiaohu +Signed-off-by: yuwang +--- + 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 + diff --git a/systemd.spec b/systemd.spec index 5f004bf1..21166b7c 100644 --- a/systemd.spec +++ b/systemd.spec @@ -25,7 +25,7 @@ Name: systemd Url: https://systemd.io/ Version: 249 -Release: 88 +Release: 89 License: MIT and LGPLv2+ and GPLv2+ Summary: System and Service Manager @@ -683,6 +683,9 @@ Patch6630: backport-mount-optimize-mountinfo-traversal-by-decoupling-dev.pa Patch6631: backport-pid1-add-env-var-to-override-default-mount-rate-limit-burst.patch Patch6632: backport-pid1-add-env-var-to-override-default-mount-rate-limit-interval.patch Patch6633: backport-import-use-CURLOPT_PROTOCOLS_STR-with-libcurl-7.85.0.patch +Patch6634: backport-man-fix-directory-for-user-home-bind-mounts.patch +Patch6635: backport-nspawn-fix-directory-in-logged-error.patch +Patch6636: 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 @@ -2197,6 +2200,11 @@ grep -q -E '^KEYMAP="?fi-latin[19]"?' /etc/vconsole.conf 2>/dev/null && /usr/bin/systemd-cryptenroll %changelog +* Tue Dec 3 2024 zhangyao - 249-89 +- 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 + * Sat Nov 30 2024 zhangyao - 249-88 - add backport-import-use-CURLOPT_PROTOCOLS_STR-with-libcurl-7.85.0.patch -- Gitee