From 147c30a39f65d97cdd523d5ad13727fd39fe2d78 Mon Sep 17 00:00:00 2001 From: zhaoxiaohu Date: Wed, 28 Aug 2024 16:46:52 +0800 Subject: [PATCH] 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 0000000..5476fda --- /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 9adcc00..1c02ffd 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 + * Tue Dec 03 2024 zhangyao - 249-88 - init support for arch ppc64le